f9d5bdd0f6
* commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e': loco: return meaningful error codes. flicvideo: return meaningful error codes. vcr1: remove disabled encoder stub Conflicts: libavcodec/flicvideo.c 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.