[FFmpeg-cvslog] rmdec: Honor .RMF tag size rather than assuming 18.

Alex Converse git at videolan.org
Sat Mar 3 00:38:30 CET 2012


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Thu Mar  1 16:47:54 2012 -0800| [1697c29d75942f1306e76e3c6486e1b822a5b437] | committer: Alex Converse

rmdec: Honor .RMF tag size rather than assuming 18.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1697c29d75942f1306e76e3c6486e1b822a5b437
---

 libavformat/rmdec.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index a5e6d2d..ae6cd0b 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -438,10 +438,8 @@ static int rm_read_header(AVFormatContext *s)
         return AVERROR(EIO);
     }
 
-    avio_rb32(pb); /* header size */
-    avio_rb16(pb);
-    avio_rb32(pb);
-    avio_rb32(pb); /* number of headers */
+    tag_size = avio_rb32(pb);
+    avio_skip(pb, tag_size - 8);
 
     for(;;) {
         if (pb->eof_reached)



More information about the ffmpeg-cvslog mailing list