ffmpeg/libavformat
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
..
2012-04-16 15:27:39 +02:00
2011-11-05 16:51:25 +01:00
2012-04-19 22:52:34 +02:00
2011-12-19 11:57:34 +01:00
2012-04-04 20:39:33 +02:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2011-08-09 19:56:25 +02:00
2012-04-06 08:32:09 +02:00
2012-03-30 05:16:15 +02:00
2012-03-31 12:37:42 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-03-10 18:01:03 +01:00
2012-04-19 15:08:13 +02:00
2012-04-06 00:53:09 +02:00
2012-04-18 15:30:34 +02:00
2012-02-29 14:26:14 +01:00
2012-04-04 20:39:33 +02:00
2012-02-28 07:20:36 +01:00
2012-02-23 16:00:22 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-04-03 19:12:52 +02:00
2012-04-03 19:12:52 +02:00
2011-12-30 20:00:53 +01:00