Merge svn changes up to r27573

Conflicts:
	libmpcodecs/vd_ffmpeg.c

17 files changed, 287 insertions, 91 deletions

diff --git a/libvo/aspecttest.c b/libvo/aspecttest.c
index 350db61290..5cb0585bff 100644
--- a/libvo/aspecttest.c
+++ b/libvo/aspecttest.c
@@ -1,6 +1,4 @@
-/* testapp for aspect.[ch] by Atmos
- * gcc aspecttest.c aspect.c -o aspecttest -DASPECT_TEST [-DASPECT_DEBUG]
- */
+/* test app for aspect.[ch] by Atmos */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libvo/geometry.c b/libvo/geometry.c
index 0d145ee989..a805c147f9 100644
--- a/libvo/geometry.c
+++ b/libvo/geometry.c
@@ -1,4 +1,22 @@
-/* This file (C) Mark Zealey <mark@zealos.org> 2002, released under GPL */
+/*
+ * copyright (C) 2002 Mark Zealey <mark@zealos.org>
+ *
+ * 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.
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/libvo/geometry.h b/libvo/geometry.h
index 50080b3dd0..77868a5aad 100644
--- a/libvo/geometry.h
+++ b/libvo/geometry.h
@@ -1,4 +1,23 @@
-/* This file (C) Mark Zealey <mark@zealos.org 2002, released under GPL */
+/*
+ * copyright (C) 2002 Mark Zealey <mark@zealos.org>
+ *
+ * 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_GEOMETRY_H
 #define MPLAYER_GEOMETRY_H
 
diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 9c84e71cf2..2dad92c605 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -1,13 +1,32 @@
-/**
- * \file gl_common.c
- * \brief OpenGL helper functions used by vo_gl.c and vo_gl2.c
+/*
+ * common OpenGL routines
  *
- * Common OpenGL routines.
- * Copyleft (C) Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>, 2005
- * Licensed under the GNU GPL v2 or later.
+ * copyleft (C) 2005 Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>
  * Special thanks go to the xine team and Matthias Hopf, whose video_out_opengl.c
  * gave me lots of good ideas.
+ *
+ * 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.
  */
+
+/**
+ * \file gl_common.c
+ * \brief OpenGL helper functions used by vo_gl.c and vo_gl2.c
+ */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/libvo/gtf.c b/libvo/gtf.c
index b297df2228..4e8429fe9e 100644
--- a/libvo/gtf.c
+++ b/libvo/gtf.c
@@ -1,13 +1,26 @@
 /*
- *  Copyright (C) 2002 Rudolf Marek <r.marek@assembler.cz>
+ * GTF calculations formulas are taken from GTF_V1R1.xls
+ * created by ANDY.MORRISH@NSC.COM
  *
- *  You can redistribute this file under terms and conditions
- *  of GNU General Public licence v2 or later.
- * 
- *  GTF calculations formulas are taken from GTF_V1R1.xls
- *  created by ANDY.MORRISH@NSC.COM
+ * copyright (C) 2002 Rudolf Marek <r.marek@assembler.cz>
+ *
+ * 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.
  */
-       
+
 //Version 0.4
 #include "config.h"
 #include <stdio.h> 
diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c
index fc1573325b..8875c3aa80 100644
--- a/libvo/vesa_lvo.c
+++ b/libvo/vesa_lvo.c
@@ -1,13 +1,24 @@
 /*
- *  vesa_lvo.c
+ * vo_vesa interface to Linux Video Overlay
+ * (partly based on vo_mga.c)
  *
- *	Copyright (C) Nick Kurshev <nickols_k@mail.ru> - Oct 2001
+ * copyright (C) 2001 Nick Kurshev <nickols_k@mail.ru>
  *
- *  You can redistribute this file under terms and conditions
- *  of GNU General Public licence v2 or later.
+ * This file is part of MPlayer.
  *
- * This file contains vo_vesa interface to Linux Video Overlay.
- * (Partly based on vo_mga.c from mplayer's package)
+ * 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.
  */
 
 #include <inttypes.h>
diff --git a/libvo/vesa_lvo.h b/libvo/vesa_lvo.h
index 2581ace34e..9d77f60045 100644
--- a/libvo/vesa_lvo.h
+++ b/libvo/vesa_lvo.h
@@ -1,12 +1,23 @@
 /*
- *  vesa_lvo.c
+ * vo_vesa interface to Linux Video Overlay
  *
- *	Copyright (C) Nick Kurshev <nickols_k@mail.ru> - Oct 2001
+ * copyright (C) 2001 Nick Kurshev <nickols_k@mail.ru>
  *
- *  You can redistribute this file under terms and conditions
- *  of GNU General Public licence v2 or later.
+ * This file is part of MPlayer.
  *
- * This file contains vo_vesa interface to Linux Video Overlay.
+ * 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_VESA_LVO_H
diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c
index fa3f36d2e3..548e8c7f4f 100644
--- a/libvo/vo_bl.c
+++ b/libvo/vo_bl.c
@@ -1,21 +1,30 @@
-/* 
- * vo_bl.c - playback using the Blinkenlights UPD protocol (and to files)
- * 
- * UDP socket handling copied from bsender.c part of blib-0.6: 
+/*
+ * playback using the Blinkenlights UDP protocol (and to files)
+ *
+ * UDP socket handling copied from bsender.c part of blib-0.6:
  * http://sven.gimp.org/blinkenlights/
- * Copyright (c)  2001-2001 The Blinkenlights Crew:
+ * copyright (c)  2001-2001 The Blinkenlights Crew:
  * 	Sven Neumann <sven@gimp.org>
  * 	Michael Natterer <mitch@gimp.org>
  * 	Daniel Mack <daniel@yoobay.net>
- * (these portions are licensed under GNU GPL v2 or "(at your option)
- * any later version")
- * 
- * Other stuff: Copyright (C) Rik Snel 2002, License GNU GPL v2 or later
+ * copyright (C) 2004 Stefan Schuermans <1stein@schuermans.info>
+ * other stuff: copyright (C) 2002 Rik Snel
+ *
+ * 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.
  *
- * patch from Stefan Schuermans <1stein@schuermans.info>:
- *   - correction of "maxval" in Blinkenlights UDP protcol
- *   - new scheme for new HDL
- *   - new scheme for grayscale in arbitrary size
+ * 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.
  */
 
 #include <stdio.h>
diff --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c
index fe5909329a..a6e4431331 100644
--- a/libvo/vo_pnm.c
+++ b/libvo/vo_pnm.c
@@ -1,7 +1,7 @@
 /*
  * PPM/PGM/PGMYUV video output driver
  *
- * Written by Ivo van Poorten. (C) Copyright 2004, 2005.
+ * copyright (C) 2004, 2005 Ivo van Poorten
  *
  * This file is part of MPlayer.
  *
diff --git a/libvo/vo_s3fb.c b/libvo/vo_s3fb.c
index e36348e8cd..7cd36fe762 100644
--- a/libvo/vo_s3fb.c
+++ b/libvo/vo_s3fb.c
@@ -1,9 +1,26 @@
-/* Copyright (C) Mark Sanderson, 2006, <mmp@kiora.ath.cx>.
- * Released under the terms and conditions of the GPL.
+/*
+ * copyright (C) 2006 Mark Sanderson <mmp@kiora.ath.cx>
  *
  * 30-Mar-2006 Modified from tdfxfb.c by Mark Zealey
- * 
- * Hints and tricks:
+ *
+ * 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.
+ */
+
+/* Hints and tricks:
  * - Use -dr to get direct rendering
  * - Use -vf yuy2 to get yuy2 rendering, *MUCH* faster than yv12
  */
diff --git a/libvo/vo_tdfx_vid.c b/libvo/vo_tdfx_vid.c
index 501017f0f7..3112a82540 100644
--- a/libvo/vo_tdfx_vid.c
+++ b/libvo/vo_tdfx_vid.c
@@ -1,23 +1,21 @@
-/* 
- *  vo_tdfx_vid.c
+/*
+ * copyright (C) 2003 Alban Bedel
  *
- *	Copyright (C) Alban Bedel - 03/2003
+ * This file is part of MPlayer.
  *
- *  This file is part of MPlayer, a free movie player.
- *	
- *  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, 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.
+ * 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.
  */
 
 #include <stdio.h>
diff --git a/libvo/vo_tdfxfb.c b/libvo/vo_tdfxfb.c
index fb825c37f3..c40cae7b82 100644
--- a/libvo/vo_tdfxfb.c
+++ b/libvo/vo_tdfxfb.c
@@ -1,6 +1,24 @@
-/* Copyright (C) Mark Zealey, 2002, <mark@zealos.org>. Released under the terms
- * and conditions of the GPL.
+/*
+ * copyright (C) 2002 Mark Zealey <mark@zealos.org>
  *
+ * 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.
+ */
+
+/*
  * 30/03/02: An almost total rewrite, added DR support and support for modes
  * other than 16bpp. Fixed the crash when playing multiple files
  * 07/04/02: Fixed DR support, added YUY2 support, fixed OSD stuff.
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index b761fdc036..a5c3c899f3 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -1,11 +1,22 @@
 /*
- *  video_out_vesa.c
+ * copyright (C) 2001 Nick Kurshev <nickols_k@mail.ru>
+ * This file is partly based on vbetest.c from lrmi distributive.
  *
- *	Copyright (C) Nick Kurshev <nickols_k@mail.ru> - Oct 2001
+ * This file is part of MPlayer.
  *
- *  You can redistribute this file under terms and conditions
- *  of GNU General Public licence v2 or later.
- *  This file is partly based on vbetest.c from lrmi distributive.
+ * 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.
  */
 
 /*
diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c
index 3f67d94648..a34744739c 100644
--- a/libvo/vo_zr.c
+++ b/libvo/vo_zr.c
@@ -1,6 +1,22 @@
-/* 
- * vo_zr.c - playback on zoran cards 
- * Copyright (C) Rik Snel 2001,2002, License GNU GPL v2 or later
+/*
+ * playback on Zoran cards
+ * copyright (C) 2001, 2003 Rik Snel
+ *
+ * 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.
  */
 
 /* $Id$ */
diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c
index c50e95c1bc..d14a8d4d39 100644
--- a/libvo/vo_zr2.c
+++ b/libvo/vo_zr2.c
@@ -1,7 +1,23 @@
-/* 
- * vo_zr2.c - playback on zoran cards 
- * Based on vo_zr.c,v 1.27
- * Copyright (C) Rik Snel 2001-2005, License GNU GPL v2 or later
+/*
+ * playback on Zoran cards, based on vo_zr.c
+ *
+ * copyright (C) 2001-2005 Rik Snel
+ *
+ * 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.
  */
 
 /* $Id$ */
diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c
index f95cbb60ad..1c52c31094 100644
--- a/libvo/vosub_vidix.c
+++ b/libvo/vosub_vidix.c
@@ -1,14 +1,25 @@
 /*
- *  vosub_vidix.c
+ * vidix interface to any mplayer vo driver
+ * (partly based on vesa_lvo.c)
  *
- *	Copyright (C) Nick Kurshev <nickols_k@mail.ru> - 2002
- *	Copyright (C) Alex Beregszaszi
+ * copyright (C) 2002 Nick Kurshev <nickols_k@mail.ru>
+ * copyright (C) Alex Beregszaszi
  *
- *  You can redistribute this file under terms and conditions
- *  of GNU General Public licence v2 or later.
+ * This file is part of MPlayer.
  *
- * This file contains vidix interface to any mplayer's VO plugin.
- * (Partly based on vesa_lvo.c from mplayer's package)
+ * 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.
  */
 
 #include <inttypes.h>
diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h
index 708db684f6..7b05607de6 100644
--- a/libvo/vosub_vidix.h
+++ b/libvo/vosub_vidix.h
@@ -1,12 +1,23 @@
 /*
- *  vosub_vidix.h
+ * vosub_vidix interface to any mplayer vo driver
  *
- *	Copyright (C) Nick Kurshev <nickols_k@mail.ru> - 2002
+ * copyright (C) 2002 Nick Kurshev <nickols_k@mail.ru>
  *
- *  You can redistribute this file under terms and conditions
- *  of GNU General Public licence v2 or later.
+ * This file is part of MPlayer.
  *
- * This file contains vosub_vidix interface to any mplayer's VO driver
+ * 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_VOSUB_VIDIX_H