[PATCH] Make ffmpeg.c use picture.pkt_pts in place of reordered_opaque, which is deprecated for this use.
Stefano Sabatini
stefano.sabatini-lala
Thu Jan 27 00:55:54 CET 2011
---
ffmpeg.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 691b73e..3a3070f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1547,7 +1547,6 @@ 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;
pkt_pts = AV_NOPTS_VALUE;
ret = avcodec_decode_video2(ist->st->codec,
@@ -1559,7 +1558,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, ist->pts);
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 *
--
1.7.2.3
--1yeeQ81UyVL57Vl7--
More information about the ffmpeg-devel
mailing list