diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-16 18:39:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-31 18:25:45 +0100 |
commit | 2fa1d7b3be7b8a071591ab40e971264e7db9f07f (patch) | |
tree | 7196ab54117bc76851097e2403dcdf31151b3755 /ffplay.c | |
parent | 97b925ea811871dfb2696348625ee763793e84c1 (diff) | |
download | ffmpeg-2fa1d7b3be7b8a071591ab40e971264e7db9f07f.tar.gz |
In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque.
AVCodecContext.reordered_opaque is deprecated for this specific use.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2855080447a226aba7e88e943fd8a8779d6daa98)
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1570,16 +1570,15 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke return 0; } - is->video_st->codec->reordered_opaque = pkt->pts; len1 = avcodec_decode_video2(is->video_st->codec, frame, &got_picture, pkt); if (got_picture) { if (decoder_reorder_pts == -1) { - *pts = guess_correct_pts(&is->pts_ctx, frame->reordered_opaque, pkt->dts); + *pts = guess_correct_pts(&is->pts_ctx, frame->pkt_pts, pkt->dts); } else if (decoder_reorder_pts) { - *pts = frame->reordered_opaque; + *pts = frame->pkt_pts; } else { *pts = pkt->dts; } |