Michael Niedermayer  
		
	
	93e3ec451c 
	
	
	Merge commit '9925f7df0a50387ade8d83cb85b40c53e41e7041' into release/0.10  
		
			... 
			* commit '9925f7df0a50387ade8d83cb85b40c53e41e7041':
  vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
  r3d: Add more input value validation
  fraps: Make the input buffer size checks more strict
  svq3: Avoid a division by zero
  rmdec: Validate the fps value
  twinvqdec: Check the ibps parameter separately
  asfdec: Check the return value of asf_read_stream_properties
  mxfdec: set audio timebase to 1/samplerate
  pcx: Check the packet size before assuming it fits a palette
  rpza: Fix a buffer size check
  xxan: Disallow odd width
  xan: Only read within the data that actually was initialized
Conflicts:
	libavcodec/fraps.c
	libavformat/mxfdec.c
	tests/ref/seek/lavf_mxf
	tests/ref/seek/lavf_mxf_d10
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
		
	 
 
		2014-01-16 22:44:32 +01:00 
	 
	
	
	
		  ..
	 
	
	
		
			
			
			
			
			
			2011-10-21 20:45:00 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-10-14 13:28:58 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-05-02 18:38:01 +02:00 
		 
	
		
			
			
			
			
			
			2011-05-02 18:38:01 +02:00 
		 
	
		
			
			
			
			
			
			2011-05-02 18:38:01 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-11-02 10:43:39 +01:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-10-14 13:28:58 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2012-09-12 16:48:59 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-12-12 21:54:52 +01:00 
		 
	
		
			
			
			
			
			
			2011-05-02 18:38:01 +02:00 
		 
	
		
			
			
			
			
			
			2011-09-08 20:53:37 +02:00 
		 
	
		
			
			
			
			
			
			2011-12-12 21:54:52 +01:00 
		 
	
		
			
			
			
			
			
			2011-07-08 19:58:19 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-12-12 21:54:52 +01:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-10-16 21:31:31 +00:00 
		 
	
		
			
			
			
			
			
			2014-01-16 22:44:32 +01:00 
		 
	
		
			
			
			
			
			
			2014-01-16 22:44:32 +01:00 
		 
	
		
			
			
			
			
			
			2011-12-12 21:54:52 +01:00 
		 
	
		
			
			
			
			
			
			2011-12-12 21:54:52 +01:00 
		 
	
		
			
			
			
			
			
			2011-12-12 21:54:52 +01:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-10-21 20:45:00 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-10-14 13:28:58 +02:00 
		 
	
		
			
			
			
			
			
			2011-12-11 19:21:39 +01:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-11-22 12:13:04 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-09-28 02:30:30 +01:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-10-14 13:28:58 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-10-14 13:28:58 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-10-14 13:28:58 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-10-14 13:28:58 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-09-26 09:02:51 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2011-10-21 20:45:00 +02:00 
		 
	
		
			
			
			
			
			
			2011-10-21 20:45:00 +02:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00 
		 
	
		
			
			
			
			
			
			2010-07-20 10:09:54 +00:00