Merge svn changes up to r30216

6 files changed, 40 insertions, 2 deletions

diff --git a/libvo/csputils.c b/libvo/csputils.c
index 6f69ec4212..e842592b1f 100644
--- a/libvo/csputils.c
+++ b/libvo/csputils.c
@@ -64,7 +64,6 @@ void mp_get_yuv2rgb_coeffs(struct mp_csp_params *params, float yuv2rgb[3][4]) {
   const float (*uv_coeffs)[3];
   const float *level_adjust;
   static const float yuv_pc_level_adjust[4] = {-16 / 255.0, -128 / 255.0, -128 / 255.0, 1.164};
-  static const float yuv_tv_level_adjust[4] = {0, -128 / 255.0, -128 / 255.0, 0};
   static const float xyz_level_adjust[4] = {0, 0, 0, 0};
   static const float uv_coeffs_table[MP_CSP_COUNT][3][3] = {
     [MP_CSP_DEFAULT] = {
diff --git a/libvo/font_load.h b/libvo/font_load.h
index 4776ff135d..7efe067aaf 100644
--- a/libvo/font_load.h
+++ b/libvo/font_load.h
@@ -19,6 +19,8 @@
 #ifndef MPLAYER_FONT_LOAD_H
 #define MPLAYER_FONT_LOAD_H
 
+#include "config.h"
+
 #ifdef CONFIG_FREETYPE
 #include <ft2build.h>
 #include FT_FREETYPE_H
diff --git a/libvo/matrixview.c b/libvo/matrixview.c
index 5b80984de4..de1e1ccf18 100644
--- a/libvo/matrixview.c
+++ b/libvo/matrixview.c
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * with MatrixView; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/libvo/matrixview.h b/libvo/matrixview.h
index d96597c243..5081aa79e7 100644
--- a/libvo/matrixview.h
+++ b/libvo/matrixview.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_MATRIXVIEW_H
 #define MPLAYER_MATRIXVIEW_H
 
diff --git a/libvo/matrixview_font.h b/libvo/matrixview_font.h
index 753e9344a2..b12e8bbe8b 100644
--- a/libvo/matrixview_font.h
+++ b/libvo/matrixview_font.h
@@ -1,3 +1,21 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef MPLAYER_MATRIXVIEW_FONT_H
 #define MPLAYER_MATRIXVIEW_FONT_H
 
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index 7f53a4c05c..677ee189db 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -19,6 +19,7 @@
 #ifndef MPLAYER_X11_COMMON_H
 #define MPLAYER_X11_COMMON_H
 
+#include <stdint.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>