Merge svn changes up to r28641

Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.

1 files changed, 2 insertions, 2 deletions

diff --git a/cpuinfo.c b/cpuinfo.c
index ad9a49c42e..ac49cd7cad 100644
--- a/cpuinfo.c
+++ b/cpuinfo.c
@@ -77,7 +77,7 @@ rdtsc(void)
 static const char*
 brandname(int i)
 {
-  const static char* brandmap[] = {
+  static const char* brandmap[] = {
     NULL,
     "Intel(R) Celeron(R) processor",
     "Intel(R) Pentium(R) III processor",
@@ -105,7 +105,7 @@ store32(char *d, unsigned int v)
 
 
 int
-main(int argc, char **argv)
+main(void)
 {
   cpuid_regs_t regs, regs_ext;
   char idstr[13];