Merge pull request #530 from knnniggett/ffmpeg

fixes ftbs with no ffmpeg support
2014-10-11 17:29:05 -05:00 · 2014-10-11 17:29:05 -05:00 · 810cf1aed3
parent f4b248a711 9ef9b17c6b
commit 810cf1aed3
1 changed files with 3 additions and 1 deletions
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@ -45,11 +45,13 @@ extern "C" {
 #include <ffmpeg/avcodec.h>
 #endif
 	
-#if defined(HAVE_LIBAVCODEC_AVCODEC_H) && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
+#if defined(HAVE_LIBAVCODEC_AVCODEC_H)
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
    #define _AVCODECID AVCodecID
 #else
    #define _AVCODECID CodecID
 #endif
+#endif

 // AVFORMAT
 #if HAVE_LIBAVFORMAT_AVFORMAT_H