summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-10-07 00:32:22 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-10-07 00:32:22 +0000
commit9b272e327495dcb7110ea4c746adeda09765e099 (patch)
treed1c7d744610cae33a3c0be25bf16e762e821737c
parent61138c43e08b7bb039fbcf50f1e71d6e735e04a5 (diff)
Init SCR in mpeg muxer based on first DTS.
This fixes issues if the first DTS is far away from 0. Originally committed as revision 25383 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpegenc.c2
-rw-r--r--tests/ref/lavf/mpg2
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index b37a774295..f94b9fa8fa 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1160,6 +1160,8 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt)
pts= pkt->pts;
dts= pkt->dts;
+ if(!s->last_scr)
+ s->last_scr= dts;
if(pts != AV_NOPTS_VALUE) pts += preload;
if(dts != AV_NOPTS_VALUE) dts += preload;
diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg
index 9b1664f566..2f5b3a7eb0 100644
--- a/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@ -1,3 +1,3 @@
-e36a005ecca9add8bda6e0655d03716f *./tests/data/lavf/lavf.mpg
+eed66277633e53724e58e3fca2709f41 *./tests/data/lavf/lavf.mpg
372736 ./tests/data/lavf/lavf.mpg
./tests/data/lavf/lavf.mpg CRC=0x2b39ed74