mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-21 06:50:44 +00:00
032ba74ed2
* qatar/master:
ARM: fix Thumb PIC on Apple
nut: add do {} while (0) to GET_V
tiffenc: Check av_malloc() results.
tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.
Use atexit() instead of defining a custom exit_program() interface.
msvc: Fix detection of VFW & Avisynth required libs
Conflicts:
ffmpeg.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
||
|---|---|---|
| .. | ||
| asm.S | ||
| bswap.h | ||
| cpu.c | ||
| cpu.h | ||
| float_dsp_arm.h | ||
| float_dsp_init_arm.c | ||
| float_dsp_init_neon.c | ||
| float_dsp_init_vfp.c | ||
| float_dsp_neon.S | ||
| float_dsp_vfp.S | ||
| intmath.h | ||
| intreadwrite.h | ||
| Makefile | ||
| timer.h | ||