RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavutil/arm
History
Michael Niedermayer 92ef4be4ab Merge remote-tracking branch 'qatar/master' 
* 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>
 		2012-04-22 22:26:42 +02:00
..
Makefile ARM: allow runtime masking of CPU features 2012-04-22 12:30:45 +01:00
bswap.h
…
cpu.c ARM: allow runtime masking of CPU features 2012-04-22 12:30:45 +01:00
cpu.h ARM: allow runtime masking of CPU features 2012-04-22 12:30:45 +01:00
intmath.h
…
intreadwrite.h
…
timer.h
…