virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'

Browse Source 
* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
  matroskadec: parse the channel layout mask for FLAC

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-28 13:01:41 +02:00
parent 1c0ce2d4e0 23f741f793
commit 579e2b2874
12 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/oggdec.h
View File

@@ -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)