diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-29 15:11:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-29 15:11:34 +0200 |
| commit | b96dc093eaf3adaf5df80559cbbaba00d1708adf (patch) | |
| tree | 81ed0d099ff08881dde2451de4f5a7b119d272fd /libavresample/version.h | |
| parent | 8672fc7b0453098d862bb1c0caafab4823ee0b4e (diff) | |
| parent | 065b3a1cfa3f23aedf76244b3f3883ba913173ff (diff) | |
| download | ffmpeg-b96dc093eaf3adaf5df80559cbbaba00d1708adf.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wmalosslessdec: increase channel_coeffs/residues size
wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14.
lagarith: check count before writing zeros.
wmaprodec: check num_vec_coeffs for validity
avidec: use actually read size instead of requested size
avidec: return 0, not packet size from read_packet().
Conflicts:
libavcodec/lagarith.c
libavcodec/wmalosslessdec.c
libavcodec/wmaprodec.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/version.h')
0 files changed, 0 insertions, 0 deletions