64591f8f86
* 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>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.