[FFmpeg-cvslog] Merge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 16:39:38 2014 +0100| [64591f8f86f2dfeac13ee6b4e971d069675ca814] | committer: Michael Niedermayer

Merge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'

* commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf':
  h264: check that execute_decode_slices() is not called too many times

Conflicts:
	libavcodec/h264.c

The check is replaced by an assert() as the mb index should not ever go out
of bounds.

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

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