aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/parseutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-21 15:15:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-21 15:15:41 +0200
commit9081b4ddddeea2c01036115a2037fb75f279be2a (patch)
treef0b50ebb43e3309493bbce6a646dfebaf7bc2f8c /libavutil/parseutils.c
parent58e2d529b3df2fda710d8ed684a7d2aafad9b5d0 (diff)
parent7f604a048e9b6128cdf9ce7e95f21d1a9822ba39 (diff)
downloadffmpeg-9081b4ddddeea2c01036115a2037fb75f279be2a.tar.gz
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 <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions