mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
088f20a33251502851958a2b5468dbe07fbf3ff6
* commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0': h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil Conflicts: libavcodec/dsputil.c libavcodec/h264.c libavcodec/h264_mb_template.c libavcodec/h264addpx_template.c libavcodec/h264dsp.c libavcodec/h264dsp.h 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%