Merge commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:27:23 +0000 (01:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:27:27 +0000 (01:27 +0200)
* commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails

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

Simple merge