Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:30:49 +0000 (14:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 12:30:49 +0000 (14:30 +0200)
commit9547e3eef36921f9937d7154048fd5eafe8d45fb
treec827949a60acb27dcdc601f0e9d8fd6a449c6935
parentc3b29023207850fa3b5b6b4dcb8e4940b86abb83
parentf824535a4a79c260b59d3178b8d958217caffd78
Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'

* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
  vdpau: deprecate bitstream buffers within the hardware context

Conflicts:
libavcodec/version.h

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