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

63 KiB

Raw Blame History

View Raw