diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 13:19:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 13:19:54 +0200 |
| commit | 63235b8d419d7250bdc3ff9067c0737a9fbe6ff7 (patch) | |
| tree | 00b47ad0fbbd22ab86030bb3f8e1a8b33eef636d /libavresample/utils.c | |
| parent | 5353bd0285277df9d81d143c262c4698fba4dc6a (diff) | |
| parent | 858864d350320dd807e349bda017026e61a47fe0 (diff) | |
| download | ffmpeg-63235b8d419d7250bdc3ff9067c0737a9fbe6ff7.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavresample/utils.c')
0 files changed, 0 insertions, 0 deletions