diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-03 15:09:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-03 15:09:04 +0000 |
| commit | f575f08ccbd8fa5c349eda377f9dc1d6a1d16c8a (patch) | |
| tree | a90c0b4a89ff2f408cb7d09c4108839fa5d1e24f | |
| parent | 5bfe91e683739e4d5ba2ce13f4f91441ed698a75 (diff) | |
| download | ffmpeg-f575f08ccbd8fa5c349eda377f9dc1d6a1d16c8a.tar.gz | |
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
| -rw-r--r-- | ffmpeg.c | 3 | ||||
| -rw-r--r-- | tests/ref/lavf/ffm | 4 |
2 files changed, 2 insertions, 5 deletions
@@ -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){ diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm index de91680556..e833944dbf 100644 --- a/tests/ref/lavf/ffm +++ b/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -a2dd3180dbfc7c8d50d34cea4cdc92d8 *./tests/data/b-lavf.ffm +03fc7f90bba9361cf6128cd4655fb20f *./tests/data/b-lavf.ffm 376832 ./tests/data/b-lavf.ffm -./tests/data/b-lavf.ffm CRC=0x2b39ed74 +./tests/data/b-lavf.ffm CRC=0xf361ed74 |