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/mov_chan.h | |
| parent | a7fbc7d7b7eabc74ceb1970a995c56043315e433 (diff) | |
| parent | 9afb7061f938831248942050cfdb449e014ed427 (diff) | |
| download | ffmpeg-fa8511851090537f6898fc50d7e6cf56841cf6ab.tar.gz | |
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/mov_chan.h')
| -rw-r--r-- | libavformat/mov_chan.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 */ |