 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
	 
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2011-12-29 17:19:46 +01:00
		 
	
		
			
			
			
			
			
			2012-04-13 00:13:31 +02:00
		 
	
		
			
			
			
			
			
			2012-04-26 22:24:58 +02:00
		 
	
		
			
			
			
			
			
			2012-03-21 01:33:53 +01:00
		 
	
		
			
			
			
			
			
			2011-05-11 13:43:30 +02:00
		 
	
		
			
			
			
			
			
			2012-02-25 04:00:43 +01:00
		 
	
		
			
			
			
			
			
			2012-02-09 12:26:45 +01:00
		 
	
		
			
			
			
			
			
			2011-12-15 18:38:04 +01:00
		 
	
		
			
			
			
			
			
			2011-12-15 18:38:06 +01:00
		 
	
		
			
			
			
			
			
			2012-04-17 12:13:22 +02:00
		 
	
		
			
			
			
			
			
			2012-01-04 13:21:08 +01:00
		 
	
		
			
			
			
			
			
			2011-12-21 19:59:45 +01:00
		 
	
		
			
			
			
			
			
			2012-02-27 00:00:55 +01:00
		 
	
		
			
			
			
			
			
			2012-01-24 16:03:09 +01:00
		 
	
		
			
			
			
			
			
			2012-03-07 03:22:49 +01:00
		 
	
		
			
			
			
			
			
			2011-04-19 01:17:59 +02:00
		 
	
		
			
			
			
			
			
			2012-04-17 04:03:50 +02:00
		 
	
		
			
			
			
			
			
			2012-01-28 11:04:19 +01:00
		 
	
		
			
			
			
			
			
			2011-12-14 21:09:08 +01:00
		 
	
		
			
			
			
			
			
			2012-02-17 01:06:43 +01:00
		 
	
		
			
			
			
			
			
			2012-02-20 17:46:26 +01:00
		 
	
		
			
			
			
			
			
			2012-02-10 01:20:07 +01:00
		 
	
		
			
			
			
			
			
			2011-12-12 01:25:37 +01:00
		 
	
		
			
			
			
			
			
			2012-04-21 10:09:49 +02:00
		 
	
		
			
			
			
			
			
			2012-04-24 02:30:41 +02:00
		 
	
		
			
			
			
			
			
			2012-04-13 21:50:37 +02:00
		 
	
		
			
			
			
			
			
			2011-11-23 23:03:37 +01:00
		 
	
		
			
			
			
			
			
			2012-04-04 15:22:44 +02:00
		 
	
		
			
			
			
			
			
			2011-09-02 23:08:03 +02:00
		 
	
		
			
			
			
			
			
			2012-01-04 13:21:08 +01:00
		 
	
		
			
			
			
			
			
			2012-03-29 04:11:10 +02:00
		 
	
		
	
		
	
		
			
			
			
			
			
			2012-04-07 13:57:40 +02:00
		 
	
		
			
			
			
			
			
			2011-04-08 01:35:43 +02:00
		 
	
		
			
			
			
			
			
			2012-01-04 13:21:08 +01:00
		 
	
		
			
			
			
			
			
			2012-04-24 02:30:41 +02:00
		 
	
		
			
			
			
			
			
			2012-04-23 18:14:25 +02:00
		 
	
		
			
			
			
			
			
			2012-03-21 01:33:53 +01:00
		 
	
		
	
		
			
			
			
			
			
			2012-01-26 21:59:09 +01:00
		 
	
		
	
		
			
			
			
			
			
			2011-12-12 01:25:37 +01:00
		 
	
		
			
			
			
			
			
			2012-03-13 01:14:04 +01:00
		 
	
		
			
			
			
			
			
			2012-02-09 12:26:45 +01:00
		 
	
		
			
			
			
			
			
			2011-12-10 02:01:03 +01:00
		 
	
		
	
		
			
			
			
			
			
			2012-03-20 11:10:25 +00:00
		 
	
		
			
			
			
			
			
			2012-02-09 12:26:45 +01:00