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

Fix ZM not compiling with ZM_NO_FFMPEG=ON since #259, closes #285

This commit is contained in:
Kfir Itzhak 2014-01-01 18:19:42 +02:00
parent 2f3934c20e
commit f39667c0cd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_rtp_source.cpp
View File

@ -24,6 +24,8 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#if HAVE_LIBAVCODEC
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
#define _AVCODECID AVCodecID #define _AVCODECID AVCodecID
#else #else
@ -386,3 +388,5 @@ bool RtpSource::getFrame( Buffer &buffer )
} }
#undef _AVCODECID #undef _AVCODECID
#endif // HAVE_LIBAVCODEC

4
src/zm_rtp_source.h
View File

@ -28,6 +28,8 @@
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
#if HAVE_LIBAVCODEC
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
#define _AVCODECID AVCodecID #define _AVCODECID AVCodecID
#else #else
@ -189,4 +191,6 @@ public:
#undef _AVCODECID #undef _AVCODECID
#endif // HAVE_LIBAVCODEC
#endif // ZM_RTP_SOURCE_H #endif // ZM_RTP_SOURCE_H