[FFmpeg-cvslog] Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 13:45:21 2013 +0200| [4ee0984341d89c657ebdd835483bbe3ea48e9c19] | committer: Michael Niedermayer

Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'

* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
  vdpau: deprecate old codec-specific pixel formats

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ee0984341d89c657ebdd835483bbe3ea48e9c19
---