Mercurial > libavformat.hg

changeset 886:7ed1351f8c7e libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra Based on patch by "mkhodor7 <-> yahoo | com"
author rtognimp
date Mon, 19 Dec 2005 20:49:00 +0000
parents da1d5db0ce5c
children d70e50f1495f
files rm.c
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rm.c	Sat Dec 17 18:14:38 2005 +0000
+++ b/rm.c	Mon Dec 19 20:49:00 2005 +0000
@@ -488,13 +488,14 @@
 {
     RMContext *rm = s->priv_data;
     ByteIOContext *pb = &s->pb;
-    char buf[128];
+    char buf[256];
     uint32_t version;
     int i;
 
     /* ra type header */
     version = get_be32(pb); /* version */
     if (((version >> 16) & 0xff) == 3) {
+        int64_t startpos = url_ftell(pb);
         /* very old version */
         for(i = 0; i < 14; i++)
             get_byte(pb);
@@ -502,8 +503,14 @@
         get_str8(pb, s->author, sizeof(s->author));
         get_str8(pb, s->copyright, sizeof(s->copyright));
         get_str8(pb, s->comment, sizeof(s->comment));
+        if ((startpos + (version & 0xffff)) >= url_ftell(pb) + 2) {
+        // fourcc (should always be "lpcJ")
         get_byte(pb);
         get_str8(pb, buf, sizeof(buf));
+        }
+        // Skip extra header crap (this should never happen)
+        if ((startpos + (version & 0xffff)) > url_ftell(pb))
+            url_fskip(pb, (version & 0xffff) + startpos - url_ftell(pb));
         st->codec->sample_rate = 8000;
         st->codec->channels = 1;
         st->codec->codec_type = CODEC_TYPE_AUDIO;