Mercurial > libavformat.hg

changeset 5507:5ebeb34e4456 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the correct ByteIOContext in extradata parsing.Fixes half of issue 1658.
author rbultje
date Fri, 08 Jan 2010 17:15:46 +0000
parents 1838c590a0b9
children 655d9d34f862
files rmdec.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/rmdec.c	Fri Jan 08 03:43:48 2010 +0000
+++ b/rmdec.c	Fri Jan 08 17:15:46 2010 +0000
@@ -245,7 +245,7 @@
                 }
                 st->codec->block_align = ast->sub_packet_size;
             }
-            if ((ret = rm_read_extradata(s->pb, st->codec, codecdata_length)) < 0)
+            if ((ret = rm_read_extradata(pb, st->codec, codecdata_length)) < 0)
                 return ret;
 
             if(ast->audio_framesize >= UINT_MAX / sub_packet_h){
@@ -267,7 +267,7 @@
             }
             if (codecdata_length >= 1) {
                 get_byte(pb);
-                if ((ret = rm_read_extradata(s->pb, st->codec, codecdata_length - 1)) < 0)
+                if ((ret = rm_read_extradata(pb, st->codec, codecdata_length - 1)) < 0)
                     return ret;
             }
             break;
@@ -321,7 +321,7 @@
         fps2= get_be16(pb);
         get_be16(pb);
 
-        if ((ret = rm_read_extradata(s->pb, st->codec, codec_data_size - (url_ftell(pb) - codec_pos))) < 0)
+        if ((ret = rm_read_extradata(pb, st->codec, codec_data_size - (url_ftell(pb) - codec_pos))) < 0)
             return ret;
 
 //        av_log(s, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);