Revert "deinterlace: add basic support for YUY2 and NV12 (fixes #2206)"

[vlc] / modules / demux / vobsub.h

diff --git a/modules/demux/vobsub.h b/modules/demux/vobsub.h
index cabdefb1f396daa568889fee0ef21c6ed66de572..4b9334fc3b974b54439efdcf9943ab6e3f744dd9 100644 (file)
--- a/modules/demux/vobsub.h
+++ b/modules/demux/vobsub.h
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * vobsub.h: Vobsub support
  *****************************************************************************
- * Copyright (C) 2009 the VideoLAN team
+ * Copyright (C) 2009 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: John Stebbins
  *
- * This program 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 static inline void vobsub_palette_rgb2yuv( uint32_t *pu_palette )
@@ -40,10 +40,10 @@ static inline void vobsub_palette_rgb2yuv( uint32_t *pu_palette )
 static inline int vobsub_palette_parse( const char *psz_buf, uint32_t *pu_palette )
 {
     if( sscanf( psz_buf, "palette: "
-                "%"PRIx32", %"PRIx32", %"PRIx32", %"PRIx32", "
-                "%"PRIx32", %"PRIx32", %"PRIx32", %"PRIx32", "
-                "%"PRIx32", %"PRIx32", %"PRIx32", %"PRIx32", "
-                "%"PRIx32", %"PRIx32", %"PRIx32", %"PRIx32"",
+                "%" PRIx32", %" PRIx32 ", %" PRIx32 ", %" PRIx32 ", "
+                "%" PRIx32", %" PRIx32 ", %" PRIx32 ", %" PRIx32 ", "
+                "%" PRIx32", %" PRIx32 ", %" PRIx32 ", %" PRIx32 ", "
+                "%" PRIx32", %" PRIx32 ", %" PRIx32 ", %" PRIx32 "",
                 &pu_palette[0], &pu_palette[1], &pu_palette[2], &pu_palette[3],
                 &pu_palette[4], &pu_palette[5], &pu_palette[6], &pu_palette[7],
                 &pu_palette[8], &pu_palette[9], &pu_palette[10], &pu_palette[11],