From 139f6b5de738a3a4746c9dc991e0bee17bda4b17 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 17 Oct 2016 19:18:03 +0200 Subject: ad_lavc, vd_lavc: fix a recent libavcodec deprecation warning Both AVFrame.pts and AVFrame.pkt_pts have existed for a long time. Until now, decoders always returned the pts via the pkt_pts field, while the pts field was used for encoding and libavfilter only. Recently, pkt_pts was deprecated, and pts was switched to always carry the pts. This means we have to be careful not to accidentally use the wrong field, depending on the libavcodec version. We have to explicitly check the version numbers. Of course the version numbers are completely idiotic, because idiotically the pkg-config and library names are the same for FFmpeg and Libav, so we have to deal with this explicitly as well. --- common/av_common.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'common') diff --git a/common/av_common.h b/common/av_common.h index 4b13dcdd0c..b5ca034def 100644 --- a/common/av_common.h +++ b/common/av_common.h @@ -46,4 +46,13 @@ void mp_set_avdict(struct AVDictionary **dict, char **kv); void mp_avdict_print_unset(struct mp_log *log, int msgl, struct AVDictionary *d); int mp_set_avopts(struct mp_log *log, void *avobj, char **kv); +#if (LIBAVCODEC_VERSION_MICRO >= 100 && \ + LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 61, 100)) || \ + (LIBAVCODEC_VERSION_MICRO < 100 && \ + LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 24, 0)) +#define MP_AVFRAME_DEC_PTS(frame) ((frame)->pts) +#else +#define MP_AVFRAME_DEC_PTS(frame) ((frame)->pkt_pts) +#endif + #endif -- cgit v1.2.3