102a1d9239
* commit 'b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2': ffv1: Make sure at least one slice context is initialized Conflicts: libavcodec/ffv1.c This condition is not possible in ffmpegs ffv1 code and already checked for by assert() for the case that some future changes make it possible. Thus merge just for meta-data 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.