Merge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 15:39:38 +0000 (16:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 15:39:38 +0000 (16:39 +0100)
commit64591f8f86f2dfeac13ee6b4e971d069675ca814
tree8ae40fc799b7a0e5063d76cb2056cdee37239d24
parenta60abb1ee01ee065fc1ab2a784fefbd5d3c94917
parent9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf
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@gmx.at>
libavcodec/h264.c