Merge commit '1147d39bca135df8673031d16989ba486a52172a' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:45:04 +0000 (14:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:00:53 +0000 (15:00 +0200)
commit58bdec57fa92cca36df470bf16bc8d124d142479
treeeb6a7b30f796c4631266e9db42f95c451c9322e6
parent7434225ed15d7326cf9d906a7cd3539eb8184e8e
parent1147d39bca135df8673031d16989ba486a52172a
Merge commit '1147d39bca135df8673031d16989ba486a52172a' into release/1.1

* commit '1147d39bca135df8673031d16989ba486a52172a':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails

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