diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 16:17:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 16:17:41 +0200 |
| commit | fe8243d7a9e3dae000389ca2020f26679c779f04 (patch) | |
| tree | bc4080990690408d4e1c88ae0843fd6a5e432267 /libavcodec/g722enc.c | |
| parent | be2dd2559f54c319f98fc324f84ac2cfb2e50265 (diff) | |
| parent | c5ec1908597824e93bbe20137ac9662f84f3cb07 (diff) | |
| download | ffmpeg-fe8243d7a9e3dae000389ca2020f26679c779f04.tar.gz | |
Merge commit 'c5ec1908597824e93bbe20137ac9662f84f3cb07' into release/0.10
* commit 'c5ec1908597824e93bbe20137ac9662f84f3cb07':
indeo: check for invalid motion vectors
indeo: clear allocated band buffers
indeo: track tile macroblock size
factor out common decoding code for Indeo 4 and Indeo 5
indeo: check custom Huffman tables for errors
dfa: improve boundary checks in decode_dds1()
dfa: use more meaningful return codes
dfa: add some checks to ensure that decoder won't write past frame end
dfa: convert to bytestream2 API
dfa: check that the caller set width/height properly.
avsdec: Set dimensions instead of relying on the demuxer.
ac3dec: ensure get_buffer() gets a buffer for the correct number of channels
Conflicts:
libavcodec/avs.c
libavcodec/dfa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722enc.c')
0 files changed, 0 insertions, 0 deletions