86b4dc6277
* commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c': lavc: set frame parameters after decoding only if necessary Conflicts: libavcodec/utils.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.