mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
259a960f1b74339626f8da890cc261a4043097fe
* qatar/master: vp6: Fix illegal read. avfilter: Don't copy garbage from the stack when setting up video pictures. avcodec: Make sure codec_type is set by avcodec_get_context_defaults2 avcodec: Remove a misplaced and useless attribute_deprecated avconv: add -dump_attachment option. avconv: add -attach option. avconv: make negative mappings disable only streams from the specified file fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64 Conflicts: libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory. 2) Licensing ------------ * See the LICENSE file.
Languages
C
90.1%
Assembly
7.9%
Makefile
1.3%
C++
0.2%
Objective-C
0.2%
Other
0.1%