aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2012-09-06 12:46:37 +0200
committerMartin Storsjö <martin@martin.st>2012-09-07 10:49:35 +0300
commit9afb7061f938831248942050cfdb449e014ed427 (patch)
tree0320384233a686f37adab9e5fd42dec763082a15 /libavformat
parent91a84a5247857d18b211f45129cf39b6788f0022 (diff)
downloadffmpeg-9afb7061f938831248942050cfdb449e014ed427.tar.gz
mov_chan: Pass a separate AVIOContext for reading
This fixes crashes when called from rtpdec_qt, where AVFormatContext->pb is null, a crash present since 3bab7cd128. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/cafdec.c2
-rw-r--r--libavformat/mov.c2
-rw-r--r--libavformat/mov_chan.c4
-rw-r--r--libavformat/mov_chan.h4
4 files changed, 7 insertions, 5 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 2b1744da03..b3cbb39a4c 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -268,7 +268,7 @@ static int read_header(AVFormatContext *s)
break;
case MKBETAG('c','h','a','n'):
- if ((ret = ff_mov_read_chan(s, st, size)) < 0)
+ if ((ret = ff_mov_read_chan(s, s->pb, st, size)) < 0)
return ret;
break;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 99fd2af573..640377a134 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -583,7 +583,7 @@ static int mov_read_chan(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (atom.size < 16)
return 0;
- ff_mov_read_chan(c->fc, st, atom.size - 4);
+ ff_mov_read_chan(c->fc, pb, st, atom.size - 4);
return 0;
}
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index 6daf7f1dbb..800bb102a0 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -543,9 +543,9 @@ uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id,
return tag;
}
-int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size)
+int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
+ int64_t size)
{
- AVIOContext *pb = s->pb;
uint32_t layout_tag, bitmap, num_descr, label_mask;
int i;
diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h
index 3972aa6178..3fae93961e 100644
--- a/libavformat/mov_chan.h
+++ b/libavformat/mov_chan.h
@@ -57,10 +57,12 @@ uint32_t ff_mov_get_channel_layout_tag(enum AVCodecID codec_id,
* Read 'chan' tag from the input stream.
*
* @param s AVFormatContext
+ * @param pb AVIOContext
* @param st The stream to set codec values for
* @param size Remaining size in the 'chan' tag
* @return 0 if ok, or negative AVERROR code on failure
*/
-int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size);
+int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
+ int64_t size);
#endif /* AVFORMAT_MOV_CHAN_H */