04bb8cc842125381a966e064fcee3e7fe8ee6386

(cherry picked from commit3b69f245db
) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/h264_slice.c (cherry picked from commit964fef3f3c
) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: libavcodec/h264.c
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.
Description
Languages
C
92.1%
Assembly
6%
Makefile
1.2%
C++
0.3%
Objective-C
0.2%
Other
0.1%