diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 23:27:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 23:27:09 +0100 |
| commit | be493ca2a8c4e3a1c147f172cd6ace8673d36f84 (patch) | |
| tree | 7dc499db9fc0ec37ecf82c550ef6a4453c776230 /libswscale | |
| parent | bcaf64b605442e1622d16da89d4ec0e7730b8a8c (diff) | |
| parent | c10da30d8426a1f681d99a780b6e311f7fb4e5c5 (diff) | |
| download | ffmpeg-be493ca2a8c4e3a1c147f172cd6ace8673d36f84.tar.gz | |
Merge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'
* commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5':
shorten: set invalid channels count to 0
vorbisdec: check memory allocations
h264: check for luma and chroma bit dept being equal
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions