diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:01:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:02:19 +0200 |
| commit | 579e2b2874aeaa9cfdeed1fd1408767e33a63029 (patch) | |
| tree | 021938ef7311d1439e74b710d721a8668c41d712 /libavformat/oggdec.h | |
| parent | 1c0ce2d4e0e70fcc42aa73fb5284f621025bb6c4 (diff) | |
| parent | 23f741f79327e31be7b2a75ebb2e02111e06e52f (diff) | |
| download | ffmpeg-579e2b2874aeaa9cfdeed1fd1408767e33a63029.tar.gz | |
Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'
* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
matroskadec: parse the channel layout mask for FLAC
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggdec.h')
| -rw-r--r-- | libavformat/oggdec.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 231b583770..22647e131f 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -129,7 +129,8 @@ extern const struct ogg_codec ff_theora_codec; extern const struct ogg_codec ff_vorbis_codec; extern const struct ogg_codec ff_vp8_codec; -int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, const uint8_t *buf, int size); +int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, + const uint8_t *buf, int size, int parse_picture); static inline int ogg_find_stream (struct ogg * ogg, int serial) |