RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/tests
History
Michael Niedermayer e890b68962 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dsputil: fix invalid array indexing
  configure: add libavresample to rpath
  build: icc: silence some warnings
  fft-test: add option to set cpuflag mask
  cpu: recognise only cpu flag names pertinent to the architecture
  avutil: add av_parse_cpu_flags() function
  vp8: armv6: fix non-armv6t2 build
  vp8: armv6 optimisations
  vp8: arm: separate ARMv6 functions from NEON
  ARM: add some compatibility macros
  mov: support eac3 audio
  avf: fix faulty check in has_duration

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	libavcodec/arm/Makefile
	libavcodec/arm/asm.S
	libavcodec/arm/vp8dsp_armv6.S
	libavcodec/arm/vp8dsp_init_arm.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-04-26 22:24:58 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-04-26 22:24:58 +02:00
ref Merge remote-tracking branch 'qatar/master' 2012-04-25 23:17:41 +02:00
Makefile Get rid of tests/data/asynth-%.sw rule. 2012-04-23 23:26:05 +02:00
asynth1.sw
…
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
base64.c
…
codec-regression.sh Get rid of tests/data/asynth-%.sw rule. 2012-04-23 23:26:05 +02:00
copycooker.sh
…
fate-run.sh Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
fate-update.sh
…
fate-valgrind.supp
…
fate.sh
…
fate_config.sh.template
…
ffserver-regression.sh
…
ffserver.conf
…
ffserver.regression.ref
…
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2012-04-25 23:17:41 +02:00
lavfi-regression.sh
…
lena.pnm
…
md5.sh
…
regression-funcs.sh Get rid of tests/data/asynth-%.sw rule. 2012-04-23 23:26:05 +02:00
rotozoom.c
…
tiny_psnr.c
…
videogen.c
…