[FFmpeg-cvslog] Merge commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 12 01:04:27 2014 +0200| [c6a683bf2291344238cb1fc2bd84c91fa1acd3bc] | committer: Michael Niedermayer

Merge commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b'

* commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b':
  vda: use hwaccel private data for internal bitstream buffer

Conflicts:
	libavcodec/vda.h
	libavcodec/vda_h264.c

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

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