mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
abe3f79d62
* qatar/master: mpeg12dec: do not add stereo3D side data to a non-existing frame Conflicts: libavcodec/mpeg12dec.c See: fe285b04bbad23ddfac164e22034b5ee76e039a6 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.