Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Aug 2013 11:55:34 +0000 (13:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Aug 2013 11:55:38 +0000 (13:55 +0200)
commit4fa00c567cd561f55e839ff187783c79a9ccae78
treeaacedc945b5d17e89ec75683c7df2226653715f3
parentb043d80be4d8d1a5d16f3e864ebff3a4bbe9c509
parentb970f85564ba6b5c17a8d642bb8161119011e7bd
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix make checkheaders for wavpackenc.h
  Fix make checkheaders for vdpau_internal.h

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