Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:54:05 +0000 (13:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:54:05 +0000 (13:54 +0200)
commit3b805dcaa97ed8ac085d6af07ba450846f8487e3
tree834878733839fa3895ec63819f1b583fcf4ad9c7
parent4ee0984341d89c657ebdd835483bbe3ea48e9c19
parent549294fbbe1c00fee37dc4d3f291b98945e11094
Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'

* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
  vdpau: deprecate VDPAU codec capability

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/vdpau.h
libavcodec/version.h