[FFmpeg-cvslog] r21626 - in trunk: ffmpeg.c tests/ref/lavf/ffm
michael
subversion
Wed Feb 3 16:09:04 CET 2010
Author: michael
Date: Wed Feb 3 16:09:04 2010
New Revision: 21626
Log:
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.
Modified:
trunk/ffmpeg.c
trunk/tests/ref/lavf/ffm
Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c Wed Feb 3 15:53:14 2010 (r21625)
+++ trunk/ffmpeg.c Wed Feb 3 16:09:04 2010 (r21626)
@@ -2236,9 +2236,6 @@ static int av_encode(AVFormatContext **o
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){
Modified: trunk/tests/ref/lavf/ffm
==============================================================================
--- trunk/tests/ref/lavf/ffm Wed Feb 3 15:53:14 2010 (r21625)
+++ trunk/tests/ref/lavf/ffm Wed Feb 3 16:09:04 2010 (r21626)
@@ -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
More information about the ffmpeg-cvslog
mailing list