diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:39:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:39:49 +0200 |
| commit | 1e83191d5c830a836bcd03d520272ef711503ac9 (patch) | |
| tree | 4db2409137933ec7525126005044832fa1d0550f /libavcodec/aacpsy.h | |
| parent | 69db5f2779f84c8070e505cf2a26a3d46728a6db (diff) | |
| parent | c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163 (diff) | |
| download | ffmpeg-1e83191d5c830a836bcd03d520272ef711503ac9.tar.gz | |
Merge commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163' into release/0.10
* commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163':
h264: reject mismatching luma/chroma bit depths during sps parsing
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsy.h')
0 files changed, 0 insertions, 0 deletions