diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 06:03:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 06:05:39 +0200 |
| commit | 2b7c0c9fe10c2c702a3f2741d0f29b284f78d1ea (patch) | |
| tree | ea8b7dfd1302e2288ab05a6297aa22058c7ee954 /COPYING.LGPLv3 | |
| parent | d3d5e84f33496f7c6ed704d53998db97a69f02e8 (diff) | |
| parent | a05c41acd1e2dc0b7f6d82fa5ecbf7b8b5514ebc (diff) | |
| download | ffmpeg-2b7c0c9fe10c2c702a3f2741d0f29b284f78d1ea.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mp3dec: perform I/S and M/S only when frame mode is joint stereo.
id3v2: add another mimetype for JPEG image
lzw: prevent buffer overreads.
WMAL: Remove inaccurate and unnecessary doxy
h264: fix cabac-on-stack after safe cabac reader.
truemotion2: convert packet header reading to bytestream2.
Conflicts:
libavcodec/lzw.c
libavcodec/truemotion2.c
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv3')
0 files changed, 0 insertions, 0 deletions