From f9664ca026485f59e14a072fcb6e45930ec928ff Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 8 Jan 2010 17:15:46 +0000 Subject: Use the correct ByteIOContext in extradata parsing.Fixes half of issue 1658. Originally committed as revision 21095 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rmdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavformat') diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 1da024aad6..ff93e515cd 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -245,7 +245,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb, } 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 @@ static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb, } 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 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb, 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); -- cgit v1.2.3