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/libschroedingerdec.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/libschroedingerdec.c')
| -rw-r--r-- | libavcodec/libschroedingerdec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index 152cbe7d47..c9930c717c 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -326,7 +326,12 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx, framewithpts->frame->components[2].length); /* Fill frame with current buffer data from Schroedinger. */ - avframe->pkt_pts = framewithpts->pts; + avframe->pts = framewithpts->pts; +#if FF_API_PKT_PTS +FF_DISABLE_DEPRECATION_WARNINGS + avframe->pkt_pts = avframe->pts; +FF_ENABLE_DEPRECATION_WARNINGS +#endif avframe->linesize[0] = framewithpts->frame->components[0].stride; avframe->linesize[1] = framewithpts->frame->components[1].stride; avframe->linesize[2] = framewithpts->frame->components[2].stride; |