diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 14:28:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 14:28:35 +0200 |
| commit | 20bd9210821cfbe1a119b71e103510c6714bf86a (patch) | |
| tree | 6e7c8381812c554bd4ed85b7b77a5871fcc1ba59 /COPYING.GPLv3 | |
| parent | 853a93804d16c79028ba8005d4c033a403fc34f9 (diff) | |
| parent | 1a8c6917f68f7378465e18f7615762bfd22704c2 (diff) | |
| download | ffmpeg-20bd9210821cfbe1a119b71e103510c6714bf86a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: avoid stuck buffer pointer in decode_nal_units
mpeg12: fix the semantics of the int* parameter of decode()
Conflicts:
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions