mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
92ef4be4ab
* qatar/master: ARM: allow runtime masking of CPU features dsputil: remove unused functions mov: Treat keyframe indexes as 1-origin if starting at non-zero. mov: Take stps entries into consideration also about key_off. Remove lowres video decoding Conflicts: ffmpeg.c ffplay.c libavcodec/arm/vp8dsp_init_arm.c libavcodec/libopenjpegdec.c libavcodec/mjpegdec.c libavcodec/mpegvideo.c libavcodec/utils.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
asm.h | ||
dsputil_alpha_asm.S | ||
dsputil_alpha.c | ||
dsputil_alpha.h | ||
Makefile | ||
motion_est_alpha.c | ||
motion_est_mvi_asm.S | ||
mpegvideo_alpha.c | ||
regdef.h | ||
simple_idct_alpha.c |