• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e890b689
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e890b689
isom.c 27.2 KB