mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer
772c801c7d
Merge commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76'
* commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76': aacenc: Fix a rounding bug in aacpsy channel bitrate computation yadif: correct strides in filter_edges_16bit yadif: restore speed of the C filtering code Conflicts: libavfilter/x86/vf_yadif_init.c No change as these commits where already in FFmpeg 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.3%
Assembly
7.8%
Makefile
1.3%
C++
0.2%
Objective-C
0.2%
Other
0.1%