1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavutil
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
..
2011-11-11 04:24:00 +01:00
2012-04-20 09:43:11 -04:00
2012-04-20 09:43:11 -04:00
2012-01-22 23:06:04 +01:00
2012-03-21 13:39:28 +01:00
2012-03-21 13:39:28 +01:00
2012-02-22 15:35:44 +01:00
2012-04-02 21:23:56 +02:00
2012-04-01 11:01:08 +02:00
2011-12-23 00:18:36 +01:00
2011-10-22 19:49:27 +02:00
2012-04-16 22:13:12 +02:00
2012-02-23 23:44:38 +01:00
2012-02-02 14:30:28 +01:00