summaryrefslogtreecommitdiffstats
path: root/media/ffvpx/libavcodec/vp9.c
diff options
context:
space:
mode:
authortrav90 <travawine@openmailbox.org>2018-02-04 13:19:22 -0600
committertrav90 <travawine@openmailbox.org>2018-02-04 13:19:22 -0600
commit30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2 (patch)
treea6031d45b30f0b5b66e2b1774d75b0f953a2aedc /media/ffvpx/libavcodec/vp9.c
parentfc7d9fade54dfbe275c4808dabe30a19415082e0 (diff)
downloadUXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar
UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.gz
UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.lz
UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.tar.xz
UXP-30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2.zip
Update FFmpeg code to n3.2-65-gee56777
Diffstat (limited to 'media/ffvpx/libavcodec/vp9.c')
-rw-r--r--media/ffvpx/libavcodec/vp9.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/ffvpx/libavcodec/vp9.c b/media/ffvpx/libavcodec/vp9.c
index 3b721495d..1aab6ba03 100644
--- a/media/ffvpx/libavcodec/vp9.c
+++ b/media/ffvpx/libavcodec/vp9.c
@@ -3991,7 +3991,12 @@ static int vp9_decode_frame(AVCodecContext *ctx, void *frame,
}
if ((res = av_frame_ref(frame, s->s.refs[ref].f)) < 0)
return res;
+ ((AVFrame *)frame)->pts = pkt->pts;
+#if FF_API_PKT_PTS
+FF_DISABLE_DEPRECATION_WARNINGS
((AVFrame *)frame)->pkt_pts = pkt->pts;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
((AVFrame *)frame)->pkt_dts = pkt->dts;
for (i = 0; i < 8; i++) {
if (s->next_refs[i].f->buf[0])