Remove index writing in RM muxer, since it is broken (multiple streams per

single index chunk) and is always empty anyway. See "[PATCH] rmenc.c: remove
index writing" thread.

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

4 files changed, 17 insertions, 25 deletions

diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c
index 78b180f5fc..21748d5d52 100644
--- a/libavformat/rmenc.c
+++ b/libavformat/rmenc.c
@@ -425,16 +425,8 @@ static int rm_write_trailer(AVFormatContext *s)
         index_pos = url_fseek(pb, 0, SEEK_CUR);
         data_size = index_pos - rm->data_pos;
 
-        /* index */
-        put_tag(pb, "INDX");
-        put_be32(pb, 10 + 10 * s->nb_streams);
-        put_be16(pb, 0);
-
-        for(i=0;i<s->nb_streams;i++) {
-            put_be32(pb, 0); /* zero indexes */
-            put_be16(pb, i); /* stream number */
-            put_be32(pb, 0); /* next index */
-        }
+        /* FIXME: write index */
+
         /* undocumented end header */
         put_be32(pb, 0);
         put_be32(pb, 0);
@@ -442,7 +434,7 @@ static int rm_write_trailer(AVFormatContext *s)
         url_fseek(pb, 0, SEEK_SET);
         for(i=0;i<s->nb_streams;i++)
             rm->streams[i].total_frames = rm->streams[i].nb_frames;
-        rv10_write_header(s, data_size, index_pos);
+        rv10_write_header(s, data_size, 0);
     } else {
         /* undocumented end header */
         put_be32(pb, 0);
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 7db54e3e3d..259d8ca1b0 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -118,12 +118,12 @@ stddev:    0.00 PSNR:999.99 bytes:  7603200/  7603200
 9086168 ./tests/data/a-jpegls.avi
 012717e7c928641410eaa6abaf126fdc *./tests/data/jpegls.vsynth.out.yuv
 stddev:    2.84 PSNR: 39.05 bytes:  7603200/  7603200
-99ef24bf57718fd29a7a91b22af2b3fe *./tests/data/a-rv10.rm
-667935 ./tests/data/a-rv10.rm
+1cc26cf6711df770e81bcfce36f28011 *./tests/data/a-rv10.rm
+667915 ./tests/data/a-rv10.rm
 d507be4253a9c8211a3738c58ba28118 *./tests/data/rv10.vsynth.out.yuv
 stddev:    8.06 PSNR: 29.99 bytes:  7603200/  7603200
-d1caf150a7b53db8fd5eb8c1d0701daf *./tests/data/a-rv20.rm
-640876 ./tests/data/a-rv20.rm
+02f1ec304a066c3bfb355adbdf4c5977 *./tests/data/a-rv20.rm
+640856 ./tests/data/a-rv20.rm
 297dc46da1a256c0a97158c036c30c7f *./tests/data/rv20.vsynth.out.yuv
 stddev:    8.26 PSNR: 29.77 bytes:  7603200/  7603200
 d13292f4583618d1b7b525a9ee010dff *./tests/data/a-asv1.avi
@@ -175,8 +175,8 @@ stddev:    2.84 PSNR: 39.05 bytes:  7603200/  7603200
 83f8df5d5f84480566af548bb037fceb *./tests/data/mp2.vsynth.out.wav
 stddev: 9328.41 PSNR: 16.92 bytes:  1055276/  1058444
 stddev: 4394.71 PSNR: 23.46 bytes:  1053352/  1058444
-aefe11ab5067621a1c674859d6413891 *./tests/data/a-ac3.rm
-98203 ./tests/data/a-ac3.rm
+3bfe347421de458dbfe572b8d4047b46 *./tests/data/a-ac3.rm
+98183 ./tests/data/a-ac3.rm
 39878597b1d65cce473639a7d8c93b02 *./tests/data/a-g726.wav
 24279 ./tests/data/a-g726.wav
 888f2f016e608d044a1bacbca5497ed2 *./tests/data/g726.vsynth.out.wav
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 29d8885f99..972507eb4f 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -4,8 +4,8 @@
 bd9e0012aa39e956605387dd499365fb *./tests/data/b-libav.asf
 339775 ./tests/data/b-libav.asf
 ./tests/data/b-libav.asf CRC=0x74113749
-c351132527ccb1e8cab06cc0822fde23 *./tests/data/b-libav.rm
-355417 ./tests/data/b-libav.rm
+db5797d4c00c8b15e2e44216389be591 *./tests/data/b-libav.rm
+355387 ./tests/data/b-libav.rm
 bdb7484c68db722f66ba1630cf79844c *./tests/data/b-libav.mpg
 378880 ./tests/data/b-libav.mpg
 ./tests/data/b-libav.mpg CRC=0x2b71a386
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index fc1ee659c7..2e648935ba 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -118,12 +118,12 @@ stddev:    0.00 PSNR:999.99 bytes:  7603200/  7603200
 8334630 ./tests/data/a-jpegls.avi
 592b3321994e26a990deb3a0a1415de9 *./tests/data/jpegls.rotozoom.out.yuv
 stddev:    0.65 PSNR: 51.83 bytes:  7603200/  7603200
-989a42671603dc1a7e6b156dccf0e820 *./tests/data/a-rv10.rm
-154330 ./tests/data/a-rv10.rm
+b1467b0e8d8cad730e36d1e8ab49d573 *./tests/data/a-rv10.rm
+154310 ./tests/data/a-rv10.rm
 61213b91b359697ebcefb9e0a53ac54a *./tests/data/rv10.rotozoom.out.yuv
 stddev:    5.43 PSNR: 33.41 bytes:  7603200/  7603200
-1b1cbff8e78602de498b4314cb991e72 *./tests/data/a-rv20.rm
-132754 ./tests/data/a-rv20.rm
+d864475aa16d84dd99de13e65003672a *./tests/data/a-rv20.rm
+132734 ./tests/data/a-rv20.rm
 c66afdcc0daac2f1b4167b9811968877 *./tests/data/rv20.rotozoom.out.yuv
 stddev:    5.42 PSNR: 33.44 bytes:  7603200/  7603200
 4eb34d2de25f67a2706456e999338fe9 *./tests/data/a-asv1.avi
@@ -175,8 +175,8 @@ stddev:    0.65 PSNR: 51.83 bytes:  7603200/  7603200
 83f8df5d5f84480566af548bb037fceb *./tests/data/mp2.rotozoom.out.wav
 stddev: 9328.41 PSNR: 16.92 bytes:  1055276/  1058444
 stddev: 4394.71 PSNR: 23.46 bytes:  1053352/  1058444
-aefe11ab5067621a1c674859d6413891 *./tests/data/a-ac3.rm
-98203 ./tests/data/a-ac3.rm
+3bfe347421de458dbfe572b8d4047b46 *./tests/data/a-ac3.rm
+98183 ./tests/data/a-ac3.rm
 39878597b1d65cce473639a7d8c93b02 *./tests/data/a-g726.wav
 24279 ./tests/data/a-g726.wav
 888f2f016e608d044a1bacbca5497ed2 *./tests/data/g726.rotozoom.out.wav