diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 15:37:19 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 15:50:24 +0400 |
commit | fa8511851090537f6898fc50d7e6cf56841cf6ab (patch) | |
tree | cc6e217fd99f5080a4726e1c74a6840962e1ff80 /libavformat/aiffdec.c | |
parent | a7fbc7d7b7eabc74ceb1970a995c56043315e433 (diff) | |
parent | 9afb7061f938831248942050cfdb449e014ed427 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov_chan: Pass a separate AVIOContext for reading
af_asyncts: check return value from lavr when flushing.
mss2: simplify loop in decode_rle()
mss12: avoid unnecessary division in arith*_get_bit()
mss2: do not try to read too many palette entries
mpegvideo: set AVFrame fields to NULL after freeing the base memory
configure: Set the right cc_e flags for msvc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiffdec.c')
-rw-r--r-- | libavformat/aiffdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index a4606a6336..41fe0d2994 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -278,7 +278,7 @@ static int aiff_read_header(AVFormatContext *s) st->codec->block_align = AV_RB32(st->codec->extradata+11*4); break; case MKTAG('C','H','A','N'): - if(ff_mov_read_chan(s, st, size) < 0) + if(ff_mov_read_chan(s, pb, st, size) < 0) return AVERROR_INVALIDDATA; break; default: /* Jump */ |