[FFmpeg-cvslog] r16605 - in trunk: libavformat/mpegtsenc.c tests/libav.regression.ref

[bcoudurier]

Author: bcoudurier
Date: Wed Jan 14 23:17:07 2009
New Revision: 16605

Log:
only write dts if they differ from pts, according to specs

Modified:
   trunk/libavformat/mpegtsenc.c
   trunk/tests/libav.regression.ref

Modified: trunk/libavformat/mpegtsenc.c
==============================================================================
--- trunk/libavformat/mpegtsenc.c	Wed Jan 14 23:14:35 2009	(r16604)
+++ trunk/libavformat/mpegtsenc.c	Wed Jan 14 23:17:07 2009	(r16605)
@@ -576,7 +576,7 @@ static void mpegts_write_pes(AVFormatCon
                 header_len += 5;
                 flags |= 0x80;
             }
-            if (dts != AV_NOPTS_VALUE) {
+            if (dts != AV_NOPTS_VALUE && dts != pts) {
                 header_len += 5;
                 flags |= 0x40;
             }
@@ -609,7 +609,7 @@ static void mpegts_write_pes(AVFormatCon
                 write_pts(q, flags >> 6, pts);
                 q += 5;
             }
-            if (dts != AV_NOPTS_VALUE) {
+            if (dts != AV_NOPTS_VALUE && dts != pts) {
                 write_pts(q, 1, dts);
                 q += 5;
             }

Modified: trunk/tests/libav.regression.ref
==============================================================================
--- trunk/tests/libav.regression.ref	Wed Jan 14 23:14:35 2009	(r16604)
+++ trunk/tests/libav.regression.ref	Wed Jan 14 23:17:07 2009	(r16605)
@@ -9,8 +9,8 @@ c351132527ccb1e8cab06cc0822fde23 *./test
 bdb7484c68db722f66ba1630cf79844c *./tests/data/b-libav.mpg
 378880 ./tests/data/b-libav.mpg
 ./tests/data/b-libav.mpg CRC=0x2b71a386
-9fd96456cbf2a550da816e563316d92f *./tests/data/b-libav.ts
-471692 ./tests/data/b-libav.ts
+676a06e0f0f6639f5199efd52fec9ca9 *./tests/data/b-libav.ts
+471316 ./tests/data/b-libav.ts
 ./tests/data/b-libav.ts CRC=0xcc4948e1
 1b28a16652bb8ac528b33f7478ca18b6 *./tests/data/b-libav.swf
 335771 ./tests/data/b-libav.swf