summaryrefslogtreecommitdiff
path: root/libavcodec/libschroedingerdec.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-03-19 21:45:24 +0100
committerAnton Khirnov <anton@khirnov.net>2016-06-21 19:54:42 +0200
commit32c8359093d1ff4f45ed19518b449b3ac3769d27 (patch)
tree59886a4e26a0931902e6f6bb14a0319d111a7383 /libavcodec/libschroedingerdec.c
parentac7bfd69678f3966e38debdb27f4bde94dc0345c (diff)
lavc: export the timestamps when decoding in AVFrame.pts
Currently it's exported as AVFrame.pkt_pts, which is also the only use for that field. The reason it is done like this is that lavc used to export various codec-specific "timing" information in AVFrame.pts, which is not done anymore. Since it is confusing to the callers to have a separate field which is used only for decoder timestamps and nothing else, deprecate pkt_pts and use just AVFrame.pts everywhere.
Diffstat (limited to 'libavcodec/libschroedingerdec.c')
-rw-r--r--libavcodec/libschroedingerdec.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c
index fb0781ed5c..f173f92f04 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;