ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #530 from knnniggett/ffmpeg 

fixes ftbs with no ffmpeg support
This commit is contained in:
Andrew Bauer 2014-10-11 17:29:05 -05:00
parent f4b248a711 9ef9b17c6b
commit 810cf1aed3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_ffmpeg.h
View File

@ -45,11 +45,13 @@ extern "C" {
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
#endif #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 #define _AVCODECID AVCodecID
#else #else
#define _AVCODECID CodecID #define _AVCODECID CodecID
#endif #endif
#endif
// AVFORMAT // AVFORMAT
#if HAVE_LIBAVFORMAT_AVFORMAT_H #if HAVE_LIBAVFORMAT_AVFORMAT_H