diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 04:27:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 04:27:35 +0100 |
| commit | 685f50b374411fce2790d710f75c15410cb3cee7 (patch) | |
| tree | 0ca64a6f8dd224fb7731ae05a2eb09440684ab3d /libavcodec/mips | |
| parent | 6086a4d74d09e2df57f9b84006c877b829707d40 (diff) | |
| parent | 0cb3cab3431276c9339df91bfdbf30510d784a6c (diff) | |
| download | ffmpeg-685f50b374411fce2790d710f75c15410cb3cee7.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
eamad: allocate a dummy reference frame when the real one is missing
libmp3lame: use the correct remaining buffer size when flushing
png: use av_mallocz_array() for the zlib zalloc function
wmaprodec: require block_align to be set.
ffv1: fix calculating slice dimensions for version 2
xxan: fix invalid memory access in xan_decode_frame_type0()
wmadec: require block_align to be set.
ivi_common: do not call MC for intra frames when dc_transform is unset
Conflicts:
libavcodec/ffv1dec.c
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mips')
0 files changed, 0 insertions, 0 deletions