Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'

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

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-06 13:45:21 +02:00
5 changed files with 17 additions and 1 deletions

View File

@@ -15,6 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first:
2013-08-xx - xxxxxxx - lavu 52.14.0 - pixfmt.h
Deprecate AV_PIX_FMT_VDPAU_*. Use AV_PIX_FMT_VDPAU instead.
2013-08-xx - xxxxxxx - lavc 55.11.0 - avcodec.h
Add output_picture_number to AVCodecParserContext.