Don't use s->pb if a local ByteIOContext was already provided by the calling

function. See mailinglist thread "[PATCH] RTSP-MS 1/15: don't use s->pb in
asf.c".

Originally committed as revision 16470 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/asf.c b/libavformat/asf.c
index 1d5c149..33cde4c 100644 (file)
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -722,7 +722,7 @@ int ff_asf_parse_packet(AVFormatContext *s, ByteIOContext *pb, AVPacket *pkt)
             return 1;
         }
         if (asf->packet_time_start == 0) {
-            if(asf_read_frame_header(s, s->pb) < 0){
+            if(asf_read_frame_header(s, pb) < 0){
                 asf->packet_segments= 0;
                 continue;
             }