# HG changeset patch
# User rbultje
# Date 1262970946 0
# Node ID 5ebeb34e44569d0a930a20cdb7548a4f4255d0bc
# Parent  1838c590a0b971b83e9d770d51be1ccdbaec3f6d
Use the correct ByteIOContext in extradata parsing.Fixes half of issue
1658.

diff -r 1838c590a0b9 -r 5ebeb34e4456 rmdec.c
--- 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);