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)
* commit '96f9fbe10933944b3eba86efa1d1ca094f2c28f8':
  h264: fix slice_type value reported in decode_slice_header()

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

Trivial merge