Michael Niedermayer 9547e3eef3 Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78' ...

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

Conflicts:
	libavcodec/version.h

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

2013-08-06 14:30:49 +02:00

63 KiB

Raw Blame History

View Raw