Merge commit '96f9fbe10933944b3eba86efa1d1ca094f2c28f8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 01:24:09 +0000 (02:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 01:24:13 +0000 (02:24 +0100)
commit2d93f76f8ab6d34fbd21970550f0d87064f76161
tree9a433b12f50b26acd087d38c863a5739f8af5cf6
parent8f853159f6ea6f6453e69a26f4ea62f9d35f4181
parent96f9fbe10933944b3eba86efa1d1ca094f2c28f8
Merge commit '96f9fbe10933944b3eba86efa1d1ca094f2c28f8'

* commit '96f9fbe10933944b3eba86efa1d1ca094f2c28f8':
  h264: fix slice_type value reported in decode_slice_header()

See: ec51b3308effbd0f434db87efabe600cd1f8cb36
Merged-by: Michael Niedermayer <michaelni@gmx.at>