Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							5231eecdaf 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						 
						
						... 
						
						
						
						* qatar/master:
  Deprecate obsolete XvMC hardware decoding support
Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo.c
	libavcodec/options_table.h
	libavutil/pixdesc.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-11-14 03:26:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							19e30a58fc 
							
						 
					 
					
						
						
							
							Deprecate obsolete XvMC hardware decoding support  
						
						 
						
						... 
						
						
						
						XvMC has long ago been superseded by newer acceleration APIs, such as
VDPAU, and few downstreams still support it. Furthermore XvMC is not
implemented within the hwaccel framework, but requires its own specific
code in the MPEG-1/2 decoder, which is a maintenance burden. 
						
						
					 
					
						2013-11-13 21:07:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							4ee0984341 
							
						 
					 
					
						
						
							
							Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'  
						
						 
						
						... 
						
						
						
						* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
  vdpau: deprecate old codec-specific pixel formats
Conflicts:
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-08-06 13:45:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rémi Denis-Courmont 
							
						 
					 
					
						
						
						
						
							
						
						
							a0ad5d0113 
							
						 
					 
					
						
						
							
							vdpau: deprecate old codec-specific pixel formats  
						
						 
						
						... 
						
						
						
						Signed-off-by: Anton Khirnov <anton@khirnov.net> 
						
						
					 
					
						2013-08-05 11:16:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ae77266fce 
							
						 
					 
					
						
						
							
							Merge commit '78071a1420b425dfb787ac739048f523007b8139'  
						
						 
						
						... 
						
						
						
						* commit '78071a1420b425dfb787ac739048f523007b8139':
  pixfmt: add AV_ prefixes to PIX_FMT_*
Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-10-08 19:42:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							78071a1420 
							
						 
					 
					
						
						
							
							pixfmt: add AV_ prefixes to PIX_FMT_*  
						
						 
						
						
						
						
					 
					
						2012-10-08 07:12:16 +02:00