From f575f08ccbd8fa5c349eda377f9dc1d6a1d16c8a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 3 Feb 2010 15:09:04 +0000 Subject: Correct opts calulation in ffmpeg.c. This correct the stop point for demuxing with -vcodec copy and -t as well as packet interleaving. (we already diddrop packets but kept demuxing them for too long due to opts being wrong) the change to ffm is due to 2 packets with timestamp 0 being stored in different order. Originally committed as revision 21626 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 325ffb1d2f..2253fc5777 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2236,9 +2236,6 @@ static int av_encode(AVFormatContext **output_files, ist = ist_table[ost->source_index]; if(no_packet[ist->file_index]) continue; - if(ost->st->codec->codec_type == CODEC_TYPE_VIDEO) - opts = ost->sync_opts * av_q2d(ost->st->codec->time_base); - else opts = ost->st->pts.val * av_q2d(ost->st->time_base); ipts = (double)ist->pts; if (!file_table[ist->file_index].eof_reached){ -- cgit v1.2.3