Remove _GNU_SOURCE and string.h too

[vlc] / modules / mux / mpjpeg.c

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index e7971b7b5e0bd6947bcae019d2edea2a0d13a958..3606234c1b4ad04ae6de64ea0ad65acf47cd872b 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * mpjpeg.c: mime multipart jpeg  muxer module for vlc
  *****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
- * $Id: dummy.c 7047 2004-03-11 17:37:50Z fenrir $
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
+ * $Id$
  *
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
  *
  * 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
@@ -18,22 +18,23 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
 
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
+#include <vlc_codecs.h>
 
 #define SEPARATOR_TEXT N_( "Multipart separator string" )
 #define SEPARATOR_LONGTEXT N_( "Multipart strings like MPJPEG use a " \
-                               "separator string between content pieces. "\
-                               "You can select this string. Default is "\
-                               "--myboundary" )
+                               "specific string to separate its content " \
+                               "pieces. You can select this string. " \
+                               "Default is --myboundary" )
 
 
 #define CONTENT_TYPE "Content-Type: image/jpeg"
@@ -47,7 +48,7 @@ static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( "MPJPEG" );
-    set_description( _("Multipart jpeg muxer") );
+    set_description( _("Multipart JPEG muxer") );
     set_capability( "sout mux", 5 );
     add_string( SOUT_CFG_PREFIX "separator", "--myboundary", NULL,
                               SEPARATOR_TEXT, SEPARATOR_LONGTEXT, VLC_TRUE );
@@ -84,7 +85,7 @@ static int Open( vlc_object_t *p_this )
     char *psz_separator_block, *psz_separator;
 
     msg_Dbg( p_mux, "Multipart jpeg muxer opened" );
-    sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
+    config_ChainParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
 
     p_sys = p_mux->p_sys = malloc( sizeof(sout_mux_sys_t) );
     p_sys->b_send_headers = VLC_TRUE;