Merge commit '7e8d27c8510a024e6d66d2e1116bb8692d9cb98a' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:29:29 +0000 (15:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:29:34 +0000 (15:29 +0200)
* commit '7e8d27c8510a024e6d66d2e1116bb8692d9cb98a':
  h264: reset ref count if decoding the slice header fails

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

Simple merge