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

fix AVOCDEC version check

This commit is contained in:
Isaac Connor 2021-01-28 09:08:51 -05:00
parent d64745a5da
commit 1212830354
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/zm_ffmpeg.h
View File

@ -359,15 +359,17 @@ void zm_dump_codecpar(const AVCodecParameters *par);
void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb); void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb);
#endif #endif
#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101) #if LIBAVCODEC_VERSION_CHECK(57, 24, 1, 45, 101)
#define zm_avcodec_decode_video( context, rawFrame, frameComplete, packet ) \ #define zm_avcodec_decode_video(context, rawFrame, frameComplete, packet) \
avcodec_send_packet( context, packet ); \ avcodec_send_packet(context, packet); \
avcodec_receive_frame( context, rawFrame ); avcodec_receive_frame(context, rawFrame);
#else #else
#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0) #if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
#define zm_avcodec_decode_video( context, rawFrame, frameComplete, packet ) avcodec_decode_video2( context, rawFrame, frameComplete, packet ) #define zm_avcodec_decode_video(context, rawFrame, frameComplete, packet) \
avcodec_decode_video2(context, rawFrame, frameComplete, packet)
#else #else
#define zm_avcodec_decode_video(context, rawFrame, frameComplete, packet ) avcodec_decode_video( context, rawFrame, frameComplete, packet->data, packet->size) #define zm_avcodec_decode_video(context, rawFrame, frameComplete, packet) \
avcodec_decode_video(context, rawFrame, frameComplete, packet->data, packet->size)
#endif #endif
#endif #endif