Merge commit '0652e024c680420d298cdf3719d0a0c030173fe3'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 21:47:49 +0000 (22:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 21:51:59 +0000 (22:51 +0100)
* commit '0652e024c680420d298cdf3719d0a0c030173fe3':
  h264: reset ref count if decoding the slice header fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c

Simple merge