[Bf-blender-cvs] [3623f32b48] master: FFmpeg: Update for the deprecated API in 3.2.x

[Sergey Sharybin]

Commit: 3623f32b48f32f751e39c361a511bfd4bc72f502
Author: Sergey Sharybin
Date:   Mon Mar 6 10:34:57 2017 +0100
Branches: master
https://developer.blender.org/rB3623f32b48f32f751e39c361a511bfd4bc72f502

FFmpeg: Update for the deprecated API in 3.2.x

Should be no functional changes.

===================================================================

M	intern/ffmpeg/ffmpeg_compat.h

===================================================================

diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
index bcfa24b06a..d6220ebf56 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;