10l (1 vs. descrLength(1)) found by (Jean Le Feuvre - jeanlf)

Originally committed as revision 2864 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index c5129ea..b46ea5c 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -415,7 +415,7 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
     }
 
     // SL descriptor
-    putDescr(pb, 0x06, descrLength(1));
+    putDescr(pb, 0x06, 1);
     put_byte(pb, 0x02);
     return updateSize (pb, pos);
 }

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 4a6b36f..2c9a1c6 100644 (file)
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -29,7 +29,7 @@ stddev:  8.18 PSNR:29.86 bytes:7602176
 a35a0d81d47e4e0c96a18ec67306db32 *./data/a-h263p.avi
 0eb167c9dfcbeeecbf3debed8af8f811 *./data/out.yuv
 stddev:  2.08 PSNR:41.74 bytes:7602176
-1499f43271be5e95880954670620eb1f *./data/a-odivx.mp4
+3f7cb6411a099cdeda089fa9f720f17a *./data/a-odivx.mp4
 d0d19e18c9d7b6fecaa7f9fc68691d89 *./data/out.yuv
 stddev:  7.94 PSNR:30.12 bytes:7602176
 5704a082cc5c5970620123ae20566286 *./data/a-huffyuv.avi

diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index cafa929..269db92 100644 (file)
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -10,7 +10,7 @@ dde4b41bc9a9a182242108318aa70903 *./data/b-libav.swf
 ./data/b-libav.swf CRC=066545e4
 964bf9fc730fa66e449b6670b705a56f *./data/b-libav.flv
 ./data/b-libav.flv CRC=e2e5bc81
-64b8a73fba1601648009298a6ad5ccf4 *./data/b-libav.mov
+18aa7c7be11e414ea11043f6de256d51 *./data/b-libav.mov
 ./data/b-libav.mov CRC=8965cc31
 1422e60a67928a2d308bab86cce46721 *./data/b-libav.nut
 ./data/b-libav.nut CRC=85260e12

diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 95f6cfd..6980ba7 100644 (file)
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -29,7 +29,7 @@ stddev:  5.41 PSNR:33.45 bytes:7602176
 d669d8ac80c4f25e2008ce31ea386465 *./data/a-h263p.avi
 7d39d1f272205a6a231d0e0baf32ff9d *./data/out.yuv
 stddev:  1.91 PSNR:42.49 bytes:7602176
-406dd7eaf5d09702d2b7164197a640a9 *./data/a-odivx.mp4
+cc1373233f8d1334091b8d3594f240e0 *./data/a-odivx.mp4
 19fad75bd384b38f08830bfa19c06183 *./data/out.yuv
 stddev:  5.27 PSNR:33.67 bytes:7602176
 242a7a18c2793e115007bc163861ef4e *./data/a-huffyuv.avi