diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-21 15:15:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-21 15:15:41 +0200 |
| commit | 9081b4ddddeea2c01036115a2037fb75f279be2a (patch) | |
| tree | f0b50ebb43e3309493bbce6a646dfebaf7bc2f8c /libavcodec/flashsvenc.c | |
| parent | 58e2d529b3df2fda710d8ed684a7d2aafad9b5d0 (diff) | |
| parent | 7f604a048e9b6128cdf9ce7e95f21d1a9822ba39 (diff) | |
Merge commit '7f604a048e9b6128cdf9ce7e95f21d1a9822ba39' into release/1.1
* commit '7f604a048e9b6128cdf9ce7e95f21d1a9822ba39':
h264: reject mismatching luma/chroma bit depths during sps parsing
Conflicts:
libavcodec/h264_ps.c
See: bdeb61ccc67911cfc5e20c7cfb1312d0501ca90a
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/flashsvenc.c')
0 files changed, 0 insertions, 0 deletions