mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
b602e47f12d72b383d986d66212341af31c9bc82
* commit '46430fd47c6239ef8742d0a34f9412d5060fa798': vc1dec: Don't attempt error concealment on field pictures vc1dec: fieldtx is only valid for interlaced frame pictures aacenc: Fix erasure of surround channels aacenc: Fix target bitrate for twoloop quantiser search Conflicts: libavcodec/vc1dec.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.
Languages
C
90.1%
Assembly
7.9%
Makefile
1.3%
C++
0.2%
Objective-C
0.2%
Other
0.1%