OSDN Git Service

Merge commit '58312b2472d3a44d7458865c459d59ef2e02bf1a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:05:08 +0000 (02:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:06:21 +0000 (02:06 +0100)
commit8e6af036b95784b6e2411c18a979c496cd69fc29
treed2719db345953345991706fcc6ac11b977a1759a
parent508229adb930c03ee0539faada5ff0b14fb570d6
parent58312b2472d3a44d7458865c459d59ef2e02bf1a
Merge commit '58312b2472d3a44d7458865c459d59ef2e02bf1a'

* commit '58312b2472d3a44d7458865c459d59ef2e02bf1a':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails

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