Merge commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 11:21:52 +0000 (13:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Oct 2014 11:21:52 +0000 (13:21 +0200)
commit0ba887bbf4d99b609247a5447dc63dc2e7550ff5
treeceeab3191d427df6dfdca35962ec23d6e00d57de
parent8df41976b7cd2e3ae0fd83ec585c886e94734acf
parent89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4
Merge commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4'

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

Conflicts:
libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vdpau.c
libavcodec/vdpau_h264.c
libavcodec/vdpau_mpeg12.c
libavcodec/vdpau_mpeg4.c
libavcodec/vdpau_vc1.c