diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 02:34:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 02:49:31 +0100 |
| commit | 6086a4d74d09e2df57f9b84006c877b829707d40 (patch) | |
| tree | 7f9744b9bd8e66cc336b0b4990f25fdd0d6d87e2 /libavcodec/vc1.c | |
| parent | d84c51904cad23ed76c38eec5080887dae7f5f27 (diff) | |
| parent | 747fbe0c212b81952bb27ec7b99fa709081e2d63 (diff) | |
| download | ffmpeg-6086a4d74d09e2df57f9b84006c877b829707d40.tar.gz | |
Merge commit '747fbe0c212b81952bb27ec7b99fa709081e2d63' into release/1.1
* commit '747fbe0c212b81952bb27ec7b99fa709081e2d63':
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
mp3dec: Fix VBR bit rate parsing
wmaprodec: return an error, not 0, when the input is too small.
vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
h264: check for luma and chroma bit dept being equal
Prepare for 9.4 Release
Conflicts:
RELEASE
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
0 files changed, 0 insertions, 0 deletions