[FFmpeg-cvslog] Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'
Michael Niedermayer
git at videolan.org
Thu Apr 4 13:06:27 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 4 13:00:59 2013 +0200| [e7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7389ed5d0bd13daf0af9ca7a4b9bc0d21aad9b1
---
More information about the ffmpeg-cvslog
mailing list