[FFmpeg-cvslog] Merge commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65' into release/0.10

Michael Niedermayer git at videolan.org
Tue Jun 3 01:37:03 CEST 2014

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 01:27:23 2014 +0200| [f2275400fe52cd0a58e532a2d048c094a5074068] | committer: Michael Niedermayer

Merge commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65' into release/0.10

* commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2275400fe52cd0a58e532a2d048c094a5074068

More information about the ffmpeg-cvslog mailing list