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/oggparseogm.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/oggparseogm.c')
| -rw-r--r-- | libavformat/oggparseogm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index 95369df89e..508a0dc541 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -111,7 +111,7 @@ ogm_header(AVFormatContext *s, int idx) } else if (bytestream2_peek_byte(&p) == 3) { bytestream2_skip(&p, 7); if (bytestream2_get_bytes_left(&p) > 1) - ff_vorbis_comment(s, &st->metadata, p.buffer, bytestream2_get_bytes_left(&p) - 1); + ff_vorbis_comment(s, &st->metadata, p.buffer, bytestream2_get_bytes_left(&p) - 1, 1); } return 1; |