diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-04-07 12:40:50 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-07-19 13:26:45 -0400 |
| commit | 3bab7cd12802dc5abf2c5cc6dec49e9e249ce204 (patch) | |
| tree | 5d14d61f0cbe7473b293cd4cea4a35fd1bdd17c9 /libavformat/mov_chan.h | |
| parent | c0196a14b9f0f920da30bc30a8887fae9050a4b3 (diff) | |
| download | ffmpeg-3bab7cd12802dc5abf2c5cc6dec49e9e249ce204.tar.gz | |
avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxer
Diffstat (limited to 'libavformat/mov_chan.h')
| -rw-r--r-- | libavformat/mov_chan.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index bd6adf6ad4..0897cd92dd 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -29,6 +29,7 @@ #include <stdint.h> #include "libavcodec/avcodec.h" +#include "avformat.h" /** * Get the channel layout for the specified channel layout tag. @@ -40,14 +41,6 @@ uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap); /** - * Get the channel layout for the specified channel label. - * - * @param[in] label channel label - * @return channel layout mask fragment - */ -uint32_t ff_mov_get_channel_label(uint32_t label); - -/** * Get the channel layout tag for the specified codec id and channel layout. * If the layout tag was not found, use a channel bitmap if possible. * @@ -60,4 +53,14 @@ uint32_t ff_mov_get_channel_layout_tag(enum CodecID codec_id, uint64_t channel_layout, uint32_t *bitmap); +/** + * Read 'chan' tag from the input stream. + * + * @param s AVFormatContext + * @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); + #endif /* AVFORMAT_MOV_CHAN_H */ |