1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavcodec
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-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-03-27 11:58:15 -04:00
2012-04-22 22:26:55 +02:00
2012-04-21 19:28:35 +02:00
2012-04-17 19:36:15 +02:00
2012-04-16 16:27:34 +02:00
2012-04-18 16:49:46 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-06 22:37:38 +03:00
2012-04-15 16:06:51 +02:00
2012-04-22 22:26:55 +02:00
2012-04-09 20:55:09 +02:00
2012-04-22 17:27:54 +02:00
2012-04-23 21:59:34 +02:00
2012-04-15 13:26:19 +02:00
2012-03-30 20:10:39 +02:00
2012-04-22 22:26:55 +02:00
2012-03-24 23:35:09 +01:00
2012-04-22 22:26:55 +02:00
2012-04-16 16:46:53 +02:00
2012-04-15 18:21:53 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-15 01:08:13 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-04-12 11:36:17 +02:00
2012-04-22 22:26:55 +02:00
2012-04-06 22:37:38 +03:00
2012-04-06 00:53:09 +02:00
2012-03-24 17:48:03 +01:00
2012-04-22 22:26:55 +02:00
2012-04-16 18:36:40 +02:00
2012-04-15 20:20:43 +02:00
2012-04-22 22:26:55 +02:00
2012-04-07 19:59:00 +02:00
2012-03-25 12:24:15 +02:00
2012-04-10 23:37:30 +02:00
2012-04-21 18:56:19 +01:00
2012-04-15 16:06:52 +02:00
2012-03-27 20:08:41 +02:00