diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:00:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 13:00:59 +0200 |
| commit | e7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1 (patch) | |
| tree | 6a574c3b143bdb066d2ac28c318b194171a23239 /libavformat/matroskadec.c | |
| parent | 534b2921028aad12d581c69ae425363ffe52df0d (diff) | |
| parent | bcc94328980e6c56546792ab08b0756abdce310b (diff) | |
Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
opt: check the return values of av_get_token for ENOMEM.
doc: Fix best_nb_channells typo
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 17139acb3f..688a61556c 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2327,7 +2327,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, st->codec->codec_id == AV_CODEC_ID_ATRAC3) && st->codec->block_align && track->audio.sub_packet_size) { - res = matroska_parse_rm_audio(matroska, track, st, data, size, + res = matroska_parse_rm_audio(matroska, track, st, data, + lace_size[n], timecode, pos); if (res) goto end; |