From 421d67e37905638b32440c0d241c8b7155bcc32b Mon Sep 17 00:00:00 2001
From: Kfir Itzhak <mastertheknife@gmail.com>
Date: Thu, 10 Oct 2013 07:16:11 +0300
Subject: [PATCH 1/2] Improvements to zm_ffmpeg.h

---
 src/zm_ffmpeg.h | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h
index d88e560a1..5fd3fe5b6 100644
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@@ -20,48 +20,56 @@
 #ifndef ZM_FFMPEG_H
 #define ZM_FFMPEG_H
 #include <stdint.h>
-#if HAVE_LIBAVCODEC
 
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+// AVUTIL
 #if HAVE_LIBAVUTIL_AVUTIL_H
 #include <libavutil/avutil.h>
 #include <libavutil/base64.h>
+#include <libavutil/mathematics.h>
 #elif HAVE_FFMPEG_AVUTIL_H
 #include <ffmpeg/avutil.h>
 #include <ffmpeg/base64.h>
-/*#else
-#error "No location for avutils.h found"*/
+#include <ffmpeg/mathematics.h>
 #endif
+
+// AVCODEC
 #if HAVE_LIBAVCODEC_AVCODEC_H
 #include <libavcodec/avcodec.h>
 #elif HAVE_FFMPEG_AVCODEC_H
 #include <ffmpeg/avcodec.h>
-/*#else
-#error "No location for avcodec.h found"*/
 #endif
+
+// AVFORMAT
 #if HAVE_LIBAVFORMAT_AVFORMAT_H
 #include <libavformat/avformat.h>
 #elif HAVE_FFMPEG_AVFORMAT_H
 #include <ffmpeg/avformat.h>
-/*#else
-#error "No location for avformat.h found"*/
 #endif
-#if HAVE_LIBSWSCALE
+
+// AVDEVICE
+#if HAVE_LIBAVDEVICE_AVDEVICE_H
+#include <libavdevice/avdevice.h>
+#elif HAVE_FFMPEG_AVDEVICE_H
+#include <ffmpeg/avdevice.h>
+#endif
+
+// SWSCALE
 #if HAVE_LIBSWSCALE_SWSCALE_H
 #include <libswscale/swscale.h>
-#include <libavutil/mathematics.h> // this is a fix for error: 'av_rescale_q' was not declared in this scope
 #elif HAVE_FFMPEG_SWSCALE_H
 #include <ffmpeg/swscale.h>
-/*#else
-#error "No location for swscale.h found"*/
 #endif
-#endif // HAVE_LIBSWSCALE
+
 #ifdef __cplusplus
 }
 #endif
 
+#if ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H )
+
 #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
  #if defined(AVIO_WRONLY)
    #define AVIO_FLAG_WRITE AVIO_WRONLY
@@ -87,7 +95,7 @@ extern "C" {
 #define SWS_CPU_CAPS_SSE2     0x02000000
 #endif
                                
-#endif // HAVE_LIBAVCODEC
+#endif // ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H )
 
 #endif // ZM_FFMPEG_H
 

From bb5b936ad3dcfeb0a6006e4ca82a29f7592f1bfb Mon Sep 17 00:00:00 2001
From: Kfir Itzhak <mastertheknife@gmail.com>
Date: Thu, 10 Oct 2013 14:04:00 +0300
Subject: [PATCH 2/2] Fixed a bug with HAVE_LIBAVDEVICE_AVDEVICE_H in cmake

---
 zoneminder-config.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zoneminder-config.cmake b/zoneminder-config.cmake
index 21b99abf4..a38f73d84 100644
--- a/zoneminder-config.cmake
+++ b/zoneminder-config.cmake
@@ -43,7 +43,7 @@
 #cmakedefine HAVE_LIBAVCODEC 1
 #cmakedefine HAVE_LIBAVCODEC_AVCODEC_H 1
 #cmakedefine HAVE_LIBAVDEVICE 1
-#cmakedefine HAVE_LIBAVDEVICE_AVDEVICE_H
+#cmakedefine HAVE_LIBAVDEVICE_AVDEVICE_H 1
 #cmakedefine HAVE_LIBAVUTIL 1
 #cmakedefine HAVE_LIBAVUTIL_AVUTIL_H 1
 #cmakedefine HAVE_LIBAVUTIL_MATHEMATICS_H 1