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/libopenh264dec.c | |
| parent | 04a3577263782cd6d70722d4ae18d75fee03dbc4 (diff) | |
| parent | 32c8359093d1ff4f45ed19518b449b3ac3769d27 (diff) | |
| download | ffmpeg-3f9137c57d2344d7613f134128235c18edcede95.tar.gz | |
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/libopenh264dec.c')
| -rw-r--r-- | libavcodec/libopenh264dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c index 6af60af434..ab0a84c698 100644 --- a/libavcodec/libopenh264dec.c +++ b/libavcodec/libopenh264dec.c @@ -221,7 +221,11 @@ static int svc_decode_frame(AVCodecContext *avctx, void *data, avframe->pts = s->pkt_filtered.pts; avframe->pkt_dts = s->pkt_filtered.dts; +#if FF_API_PKT_PTS +FF_DISABLE_DEPRECATION_WARNINGS avframe->pkt_pts = s->pkt_filtered.pts; +FF_ENABLE_DEPRECATION_WARNINGS +#endif *got_frame = 1; } |