 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-26 22:24:58 +02:00
		 
	
		
			
			
			
			
			
			2012-04-25 23:17:41 +02:00
		 
	
		
			
			
			
			
			
			2012-01-23 23:41:32 +01:00
		 
	
		
			
			
			
			
			
			2012-04-20 22:18:26 +02:00
		 
	
		
			
			
			
			
			
			2012-01-19 01:19:38 +01:00
		 
	
		
			
			
			
			
			
			2012-04-23 23:26:05 +02:00
		 
	
		
			
			
			
			
			
			2011-07-07 22:47:24 +02:00
		 
	
		
			
			
			
			
			
			2011-11-24 00:33:20 +01:00
		 
	
		
			
			
			
			
			
			2012-04-19 21:23:52 +02:00
		 
	
		
			
			
			
			
			
			2011-03-19 13:35:52 +00:00
		 
	
		
			
			
			
			
			
			2012-01-21 12:04:46 +01:00
		 
	
		
			
			
			
			
			
			2012-01-30 20:35:09 +01:00
		 
	
		
			
			
			
			
			
			2011-08-01 11:36:16 +02:00
		 
	
		
			
			
			
			
			
			2011-08-01 11:36:16 +02:00
		 
	
		
			
			
			
			
			
			2011-08-01 11:36:16 +02:00
		 
	
		
			
			
			
			
			
			2012-04-25 23:17:41 +02:00
		 
	
		
			
			
			
			
			
			2012-04-14 22:37:43 +02:00
		 
	
		
	
		
			
			
			
			
			
			2012-04-23 23:26:05 +02:00
		 
	
		
			
			
			
			
			
			2011-01-18 20:48:24 +00:00
		 
	
		
			
			
			
			
			
			2012-04-23 23:26:05 +02:00
		 
	
		
			
			
			
			
			
			2012-03-15 21:52:11 +01:00
		 
	
		
			
			
			
			
			
			2012-04-15 15:46:46 +02:00
		 
	
		
			
			
			
			
			
			2012-01-19 01:19:38 +01:00