ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use a define to deal with the codec/codecpar version problem

pull/3187/head
Isaac Connor 2021-03-03 15:43:59 -05:00
parent 253ed928ec
commit d34d2e2398
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/zm_ffmpeg.h
View File

@ -351,6 +351,13 @@ void zm_dump_codecpar(const AVCodecParameters *par);
# define AV_PACKET_DURATION_FMT "d" # define AV_PACKET_DURATION_FMT "d"
#endif #endif
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
#define CODEC_TYPE(stream) stream->codecpar->codec_type
#else
#define CODEC_TYPE(stream) stream->codec->codec_type
#endif
#ifndef DBG_OFF #ifndef DBG_OFF
# define ZM_DUMP_PACKET(pkt, text) \ # define ZM_DUMP_PACKET(pkt, text) \
Debug(2, "%s: pts: %" PRId64 ", dts: %" PRId64 \ Debug(2, "%s: pts: %" PRId64 ", dts: %" PRId64 \
@ -379,7 +386,7 @@ void zm_dump_codecpar(const AVCodecParameters *par);
pkt.dts, \ pkt.dts, \
pkt.size, \ pkt.size, \
pkt.stream_index, \ pkt.stream_index, \
av_get_media_type_string(stream->codecpar->codec_type), \ av_get_media_type_string(CODEC_TYPE(stream)), \
pkt.flags, \ pkt.flags, \
pkt.flags & AV_PKT_FLAG_KEY, \ pkt.flags & AV_PKT_FLAG_KEY, \
pkt.pos, \ pkt.pos, \