diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2011-02-05 00:28:24 -0500 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-05 16:37:43 -0500 |
| commit | 6b474953975fd8ea64d1ed4d09c42b2d8e787c6f (patch) | |
| tree | 6f92d1e2e6d32563a084d3e3623cc3d2a947acb4 | |
| parent | 185a155e5701cfaa0281bf91a5a140d498aa0a7f (diff) | |
| download | ffmpeg-6b474953975fd8ea64d1ed4d09c42b2d8e787c6f.tar.gz | |
Adopt pkt_dts/pkt_pts in lavc clients
No behavior change; this makes DTS reliable with the next patch.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | ffmpeg.c | 5 | ||||
| -rw-r--r-- | ffplay.c | 4 |
2 files changed, 5 insertions, 4 deletions
@@ -1539,7 +1539,8 @@ static int output_packet(AVInputStream *ist, int ist_index, decoded_data_size = (ist->st->codec->width * ist->st->codec->height * 3) / 2; /* XXX: allocate picture correctly */ avcodec_get_frame_defaults(&picture); - ist->st->codec->reordered_opaque = pkt_pts; + avpkt.pts = pkt_pts; + avpkt.dts = ist->pts; pkt_pts = AV_NOPTS_VALUE; ret = avcodec_decode_video2(ist->st->codec, @@ -1551,7 +1552,7 @@ static int output_packet(AVInputStream *ist, int ist_index, /* no picture yet */ goto discard_packet; } - ist->next_pts = ist->pts = guess_correct_pts(&ist->pts_ctx, picture.reordered_opaque, ist->pts); + ist->next_pts = ist->pts = guess_correct_pts(&ist->pts_ctx, picture.pkt_pts, picture.pkt_dts); if (ist->st->codec->time_base.num != 0) { int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame; ist->next_pts += ((int64_t)AV_TIME_BASE * @@ -1576,11 +1576,11 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke if (got_picture) { if (decoder_reorder_pts == -1) { - *pts = guess_correct_pts(&is->pts_ctx, frame->pkt_pts, pkt->dts); + *pts = guess_correct_pts(&is->pts_ctx, frame->pkt_pts, frame->pkt_dts); } else if (decoder_reorder_pts) { *pts = frame->pkt_pts; } else { - *pts = pkt->dts; + *pts = frame->pkt_dts; } if (*pts == AV_NOPTS_VALUE) { |