Commit: c6761b063eb2c1493c4b282e56023b92ed5a3a4e
Author: Sergey Sharybin
Date: Mon Mar 6 10:34:57 2017 +0100
Branches: temp-select-pick
https://developer.blender.org/rBc6761b063eb2c1493c4b282e56023b92ed5a3a4e
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
