diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 13:37:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 13:50:24 +0200 |
| commit | fa8511851090537f6898fc50d7e6cf56841cf6ab (patch) | |
| tree | cc6e217fd99f5080a4726e1c74a6840962e1ff80 /libavformat/cafdec.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/cafdec.c')
| -rw-r--r-- | libavformat/cafdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index f1682b0d34..a576dac07e 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; |