diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-03-19 21:45:24 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-06-21 19:54:42 +0200 |
| commit | 32c8359093d1ff4f45ed19518b449b3ac3769d27 (patch) | |
| tree | 59886a4e26a0931902e6f6bb14a0319d111a7383 /libavcodec/qsvdec.c | |
| parent | ac7bfd69678f3966e38debdb27f4bde94dc0345c (diff) | |
| download | ffmpeg-32c8359093d1ff4f45ed19518b449b3ac3769d27.tar.gz | |
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/qsvdec.c')
| -rw-r--r-- | libavcodec/qsvdec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index ac7a1e60b9..0215761335 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -352,7 +352,12 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, outsurf = out_frame->surface; - frame->pkt_pts = frame->pts = outsurf->Data.TimeStamp; +#if FF_API_PKT_PTS +FF_DISABLE_DEPRECATION_WARNINGS + frame->pkt_pts = outsurf->Data.TimeStamp; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + frame->pts = outsurf->Data.TimeStamp; frame->repeat_pict = outsurf->Info.PicStruct & MFX_PICSTRUCT_FRAME_TRIPLING ? 4 : |