diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 15:01:41 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 15:02:19 +0400 |
| commit | 579e2b2874aeaa9cfdeed1fd1408767e33a63029 (patch) | |
| tree | 021938ef7311d1439e74b710d721a8668c41d712 /libavformat/flacdec.c | |
| parent | 1c0ce2d4e0e70fcc42aa73fb5284f621025bb6c4 (diff) | |
| parent | 23f741f79327e31be7b2a75ebb2e02111e06e52f (diff) | |
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/flacdec.c')
| -rw-r--r-- | libavformat/flacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 880ad35049..d601c753a3 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -138,7 +138,7 @@ static int flac_read_header(AVFormatContext *s) if (metadata_type == FLAC_METADATA_TYPE_VORBIS_COMMENT) { AVDictionaryEntry *chmask; - if (ff_vorbis_comment(s, &s->metadata, buffer, metadata_size)) { + if (ff_vorbis_comment(s, &s->metadata, buffer, metadata_size, 1)) { av_log(s, AV_LOG_WARNING, "error parsing VorbisComment metadata\n"); } |