generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5f3f03f5dd
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
..
bswap.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
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 arm: fix av_clipl_int32() asm 2011-10-11 20:25:55 +02:00
intreadwrite.h Merge remote-tracking branch 'qatar/master' 2011-05-31 02:08:20 +02:00
Makefile ARM: allow runtime masking of CPU features 2012-04-22 12:30:45 +01:00
timer.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00