[FFmpeg-cvslog] Merge commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  6 13:21:52 2014 +0200| [0ba887bbf4d99b609247a5447dc63dc2e7550ff5] | committer: Michael Niedermayer

Merge commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4'

* commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4':
  vdpau: pass codec-specific parameters from hwaccel

Conflicts:
	libavcodec/vdpau.c

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

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