[FFmpeg-cvslog] Merge commit '858864d350320dd807e349bda017026e61a47fe0' into release/1.1
Michael Niedermayer
git at videolan.org
Sun May 12 13:27:26 CEST 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 13:19:54 2013 +0200| [63235b8d419d7250bdc3ff9067c0737a9fbe6ff7] | committer: Michael Niedermayer
Merge commit '858864d350320dd807e349bda017026e61a47fe0' into release/1.1
* commit '858864d350320dd807e349bda017026e61a47fe0':
xmv: check audio track parameters validity.
bmv: check for len being valid in bmv_decode_frame().
xmv: do not leak memory in the error paths in xmv_read_header()
matroska: pass the lace size to the matroska_parse_rm_audio
Conflicts:
libavformat/matroskadec.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63235b8d419d7250bdc3ff9067c0737a9fbe6ff7
---
More information about the ffmpeg-cvslog
mailing list