Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Apr 2012 20:24:58 +0000 (22:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Apr 2012 20:24:58 +0000 (22:24 +0200)
commite890b689628634d75e093b24ae257b008fc85443
treeaf2189297e3da55438dc0e968633a8a2806fb5fd
parentf1f5b39866c4deb7800aa9288010cdbd386da477
parent0a07f2b346433a9a2677c69c6b29a1a827e39109
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>
configure
doc/APIchanges
libavcodec/arm/asm.S
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/dsputil.c
libavcodec/fft-test.c
libavformat/isom.c
libavformat/utils.c
libavutil/avutil.h
libavutil/cpu.c
libavutil/cpu.h