diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 12:55:50 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-10-07 13:03:36 +0200 |
| commit | 3f9137c57d2344d7613f134128235c18edcede95 (patch) | |
| tree | cc4bfcc63bd6080c74d5cb526f286a1f4c96d4df /libavcodec/vp9.c | |
| parent | 04a3577263782cd6d70722d4ae18d75fee03dbc4 (diff) | |
| parent | 32c8359093d1ff4f45ed19518b449b3ac3769d27 (diff) | |
Merge commit '32c8359093d1ff4f45ed19518b449b3ac3769d27'
* commit '32c8359093d1ff4f45ed19518b449b3ac3769d27':
lavc: export the timestamps when decoding in AVFrame.pts
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/vp9.c')
| -rw-r--r-- | libavcodec/vp9.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index cb2a4a2921..779f2d50f3 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -3992,7 +3992,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]) |