| 
							
							
								 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 |  |