diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2012-09-06 12:46:37 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-07 10:49:35 +0300 |
| commit | 9afb7061f938831248942050cfdb449e014ed427 (patch) | |
| tree | 0320384233a686f37adab9e5fd42dec763082a15 /libavformat/mov_chan.c | |
| parent | 91a84a5247857d18b211f45129cf39b6788f0022 (diff) | |
| download | ffmpeg-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/mov_chan.c')
| -rw-r--r-- | libavformat/mov_chan.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |