[FFmpeg-cvslog] Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 14:30:49 2013 +0200| [9547e3eef36921f9937d7154048fd5eafe8d45fb] | committer: Michael Niedermayer

Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'

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

Conflicts:
	libavcodec/version.h

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9547e3eef36921f9937d7154048fd5eafe8d45fb
---