diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-06 12:34:57 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-06 12:34:57 +0300 |
| commit | 3623f32b48f32f751e39c361a511bfd4bc72f502 (patch) | |
| tree | 574aba22e9ff758a8256fbd5841932b08448808e /intern/ffmpeg | |
| parent | 355ad008a26f9605752108c74e813c43dc0659d2 (diff) | |
FFmpeg: Update for the deprecated API in 3.2.x
Should be no functional changes.
Diffstat (limited to 'intern/ffmpeg')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index bcfa24b06a8..d6220ebf562 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -350,7 +350,12 @@ int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, FFMPEG_INLINE int64_t av_get_pts_from_frame(AVFormatContext *avctx, AVFrame * picture) { - int64_t pts = picture->pkt_pts; + int64_t pts; +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 34, 100) + pts = picture->pts; +#else + pts = picture->pkt_pts; +#endif if (pts == AV_NOPTS_VALUE) { pts = picture->pkt_dts; |