mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
e847f41285
* qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h 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 |