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/crystalhd.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/crystalhd.c')
| -rw-r--r-- | libavcodec/crystalhd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 59b14b9c29..0f5101a01f 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -707,7 +707,12 @@ static inline CopyRet copy_frame(AVCodecContext *avctx, if (interlaced) priv->pic->top_field_first = !bottom_first; + priv->pic->pts = pkt_pts; +#if FF_API_PKT_PTS +FF_DISABLE_DEPRECATION_WARNINGS priv->pic->pkt_pts = pkt_pts; +FF_ENABLE_DEPRECATION_WARNINGS +#endif if (!priv->need_second_field) { *got_frame = 1; |