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/oggparseflac.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/oggparseflac.c')
| -rw-r--r-- | libavformat/oggparseflac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index f69533f6c1..875de2a3b4 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -68,7 +68,7 @@ flac_header (AVFormatContext * s, int idx) avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) { - ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4); + ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4, 1); } return 1; |