Merge commit 'fcc49924db6c5530a3346c45a6999244d92eaf48'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:18:17 +0000 (18:18 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:18:17 +0000 (18:18 +0100)
commit947447bfdc6972dc1bbba1125b1e8c763a2ac177
treed60d5ae253868ecb79dd12972a0d0552d92ac7b9
parent42a088784b94847cd04802b36866cb9a8d196151
parentfcc49924db6c5530a3346c45a6999244d92eaf48
Merge commit 'fcc49924db6c5530a3346c45a6999244d92eaf48'

* commit 'fcc49924db6c5530a3346c45a6999244d92eaf48':
  vdpau: Remove a spurious CONFIG_H263_VDPAU_HWACCEL

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>