diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:03:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:03:37 +0100 |
| commit | 5cc30e0f603a030b97b7be37a7aa5d22d13f7a07 (patch) | |
| tree | 01875b465e2f7749cc8f87f1df756b2cb2ca2596 /media/ffvpx/libavcodec/vp9.c | |
| parent | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (diff) | |
| parent | 30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2 (diff) | |
| download | UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.gz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.lz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.xz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.zip | |
Merge pull request #10 from trav90/media-work
Update FFmpeg code to n3.2-65-gee56777
Diffstat (limited to 'media/ffvpx/libavcodec/vp9.c')
| -rw-r--r-- | media/ffvpx/libavcodec/vp9.c | 5 |
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]) |