Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:45:21 +0000 (13:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:45:21 +0000 (13:45 +0200)
commit4ee0984341d89c657ebdd835483bbe3ea48e9c19
tree7df0914957f1708ac23cd0b6cc8f4f8a8b1bbf24
parentbf36dc50ea448999c8f8c7a35f6139a7040f6275
parenta0ad5d011318f951ecd4c9ffe1829518c9533909
Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'

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

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/old_pix_fmts.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h