 Michael Niedermayer
		
	
	
		e890b68962
		
	
	
	
	Merge remote-tracking branch 'qatar/master'
			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:42 +02:00
		 
	
		
	
		
	
		
			
			
			
			
			
			2012-04-26 22:24:58 +02:00
		 
	
		
	
		
			
			
			
			
			
			2012-04-22 22:26:42 +02:00
		 
	
		
	
		
			
			
			
			
			
			2012-03-13 01:56:33 +01: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-22 22:26:55 +02:00
		 
	
		
			
			
			
			
			
			2012-04-22 22:26:42 +02:00
		 
	
		
	
		
	
		
			
			
			
			
			
			2012-04-22 22:26:42 +02:00
		 
	
		
	
		
			
			
			
			
			
			2012-04-22 22:26:42 +02:00
		 
	
		
	
		
			
			
			
			
			
			2012-04-22 22:26:42 +02:00
		 
	
		
	
		
	
		
	
		
			
			
			
			
			
			2012-04-22 22:26:42 +02:00
		 
	
		
	
		
	
		
			
			
			
			
			
			2012-04-22 22:26:42 +02:00
		 
	
		
	
		
			
			
			
			
			
			2012-03-08 02:51:45 +01:00
		 
	
		
	
		
			
			
			
			
			
			2012-04-25 21:41:39 +01:00
		 
	
		
	
		
	
		
	
		
	
		
			
			
			
			
			
			2012-04-22 12:30:45 +01:00
		 
	
		
			
			
			
			
			
			2012-04-22 22:26:42 +02:00
		 
	
		
			
			
			
			
			
			2012-03-13 01:56:33 +01:00
		 
	
		
	
		
	
		
	
		
	
		
	
		
	
		
	
		
			
			
			
			
			
			2012-04-10 10:06:48 -07:00
		 
	
		
	
		
			
			
			
			
			
			2012-04-22 12:30:45 +01:00
		 
	
		
	
		
	
		
	
		
	
		
	
		
	
		
	
		
	
		
	
		
			
			
			
			
			
			2012-04-25 23:16:31 +01:00
		 
	
		
			
			
			
			
			
			2012-04-26 22:24:58 +02:00
		 
	
		
			
			
			
			
			
			2012-04-25 21:41:39 +01:00
		 
	
		
			
			
			
			
			
			2012-04-25 21:41:39 +01:00
		 
	
		
			
			
			
			
			
			2012-04-25 21:41:39 +01:00
		 
	
		
			
			
			
			
			
			2012-04-25 21:41:39 +01:00
		 
	
		
	
		
			
			
			
			
			
			2012-04-22 22:26:42 +02:00