Merge branch 'master' of git@git.videolan.org:vlc

diff --git a/.gitignore b/.gitignore
index 4fd39df39247b6b94337d5266e0b54ce6966ab12..a9e4343ba25e468b4906e74bc32a51396a7981c9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,14 @@
 *.cache
 *.lo
 *.la
+*.m4
+*.mak
+*.moc.cpp
+*.o
+*.vlt
 .deps
 .libs
+.dirstamp
 ABOUT-NLS
 aclocal.m4
 autotools
@@ -16,3 +22,9 @@ Makefile.in
 stamp-*
 vlc-config
 vlc-config.in
+qvlc
+rvlc
+svlc
+cvlc
+qvlc
+vlc

diff --git a/extras/contrib/.gitignore b/extras/contrib/.gitignore
index e7083dae2fb6a3c3b44421ccfb6aa8a2e5b5255d..2b6ca38d5a24bcd86ef7325a859af613feb03b04 100644 (file)
--- a/extras/contrib/.gitignore
+++ b/extras/contrib/.gitignore
@@ -2,7 +2,9 @@
 share/*
 bin/*
 lib/*
-
+include/*
+man/*
+sbin/*
 # Ignore fetched contrib
 src/*
 # But not our files

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ff19e42b3b5c5458d25646837bda61894a56eaef..9fec7482a2f91ac60a2b89f801e6dd4e0d50e9e9 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1243,8 +1243,8 @@ goom: goom$(GOOM2k4_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/goom.patch
-       patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
+       patch -p0 < Patches/goom2k4-0-mmx.patch
 ifdef HAVE_WIN32
        (cd $@; dos2unix configure.in)
        patch -p0 < Patches/goom2k4-0-win32.patch

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 8be282f7fe820813be821ff2282ace53481454b6..99bdcfd3e587edf6a39dc188f5ac936f39080b80 100644 (file)
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -892,6 +892,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     int                  i;
 
     p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) );
+    if( !p_input->p_sys )
+        return VLC_ENOMEM;
 
     /* Init this new stream */
     if ( p_sys->b_es_id_pid )
@@ -1021,6 +1023,12 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
 
     p_stream->i_langs = 1+p_input->p_fmt->i_extra_languages;
     p_stream->lang = malloc(p_stream->i_langs*3);
+    if( !p_stream->lang )
+    {
+        p_stream->i_langs = 0;
+        free( p_stream );
+        return VLC_ENOMEM;
+    }
     i = 1;
     p_stream->lang[0] =
     p_stream->lang[1] =
@@ -1058,7 +1066,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         {
             char *psz = p_input->p_fmt->p_extra_languages[i-1].psz_language;
             const iso639_lang_t *pl = NULL;
- 
+
             if( strlen( psz ) == 2 )
             {
                 pl = GetLang_1( psz );
@@ -1085,17 +1093,6 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         i++;
     }
 
-    /* Copy extra data (VOL for MPEG-4 and extra BitMapInfoHeader for VFW */
-    p_stream->i_decoder_specific_info = p_input->p_fmt->i_extra;
-    if( p_stream->i_decoder_specific_info > 0 )
-    {
-        p_stream->p_decoder_specific_info =
-            malloc( p_stream->i_decoder_specific_info );
-        memcpy( p_stream->p_decoder_specific_info,
-                p_input->p_fmt->p_extra,
-                p_input->p_fmt->i_extra );
-    }
-
     /* Create decoder specific info for subt */
     if( p_stream->i_codec == VLC_FOURCC( 's', 'u','b', 't' ) )
     {
@@ -1104,44 +1101,64 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         p_stream->i_decoder_specific_info = 55;
         p_stream->p_decoder_specific_info = p =
             malloc( p_stream->i_decoder_specific_info );
-
-        p[0] = 0x10;    /* textFormat, 0x10 for 3GPP TS 26.245 */
-        p[1] = 0x00;    /* flags: 1b: associated video info flag
-                                  3b: reserved
-                                  1b: duration flag
-                                  3b: reserved */
-        p[2] = 52;      /* remaining size */
-
-        p += 3;
-
-        p[0] = p[1] = p[2] = p[3] = 0; p+=4;    /* display flags */
-        *p++ = 0;  /* horizontal justification (-1: left, 0 center, 1 right) */
-        *p++ = 1;  /* vertical   justification (-1: top, 0 center, 1 bottom) */
-
-        p[0] = p[1] = p[2] = 0x00; p+=3;/* background rgb */
-        *p++ = 0xff;                    /* background a */
-
-        p[0] = p[1] = 0; p += 2;        /* text box top */
-        p[0] = p[1] = 0; p += 2;        /* text box left */
-        p[0] = p[1] = 0; p += 2;        /* text box bottom */
-        p[0] = p[1] = 0; p += 2;        /* text box right */
-
-        p[0] = p[1] = 0; p += 2;        /* start char */
-        p[0] = p[1] = 0; p += 2;        /* end char */
-        p[0] = p[1] = 0; p += 2;        /* default font id */
-
-        *p++ = 0;                       /* font style flags */
-        *p++ = 12;                      /* font size */
-
-        p[0] = p[1] = p[2] = 0x00; p+=3;/* foreground rgb */
-        *p++ = 0x00;                    /* foreground a */
-
-        p[0] = p[1] = p[2] = 0; p[3] = 22; p += 4;
-        memcpy( p, "ftab", 4 ); p += 4;
-        *p++ = 0; *p++ = 1;             /* entry count */
-        p[0] = p[1] = 0; p += 2;        /* font id */
-        *p++ = 9;                       /* font name length */
-        memcpy( p, "Helvetica", 9 );    /* font name */
+        if( p )
+        {
+            p[0] = 0x10;    /* textFormat, 0x10 for 3GPP TS 26.245 */
+            p[1] = 0x00;    /* flags: 1b: associated video info flag
+                                    3b: reserved
+                                    1b: duration flag
+                                    3b: reserved */
+            p[2] = 52;      /* remaining size */
+
+            p += 3;
+
+            p[0] = p[1] = p[2] = p[3] = 0; p+=4;    /* display flags */
+            *p++ = 0;  /* horizontal justification (-1: left, 0 center, 1 right) */
+            *p++ = 1;  /* vertical   justification (-1: top, 0 center, 1 bottom) */
+
+            p[0] = p[1] = p[2] = 0x00; p+=3;/* background rgb */
+            *p++ = 0xff;                    /* background a */
+
+            p[0] = p[1] = 0; p += 2;        /* text box top */
+            p[0] = p[1] = 0; p += 2;        /* text box left */
+            p[0] = p[1] = 0; p += 2;        /* text box bottom */
+            p[0] = p[1] = 0; p += 2;        /* text box right */
+
+            p[0] = p[1] = 0; p += 2;        /* start char */
+            p[0] = p[1] = 0; p += 2;        /* end char */
+            p[0] = p[1] = 0; p += 2;        /* default font id */
+
+            *p++ = 0;                       /* font style flags */
+            *p++ = 12;                      /* font size */
+
+            p[0] = p[1] = p[2] = 0x00; p+=3;/* foreground rgb */
+            *p++ = 0x00;                    /* foreground a */
+
+            p[0] = p[1] = p[2] = 0; p[3] = 22; p += 4;
+            memcpy( p, "ftab", 4 ); p += 4;
+            *p++ = 0; *p++ = 1;             /* entry count */
+            p[0] = p[1] = 0; p += 2;        /* font id */
+            *p++ = 9;                       /* font name length */
+            memcpy( p, "Helvetica", 9 );    /* font name */
+        }
+        else p_stream->i_decoder_specific_info = 0;
+    }
+    else
+    {
+        /* Copy extra data (VOL for MPEG-4 and extra BitMapInfoHeader for VFW */
+        p_stream->i_decoder_specific_info = p_input->p_fmt->i_extra;
+        if( p_stream->i_decoder_specific_info > 0 )
+        {
+            p_stream->p_decoder_specific_info =
+                malloc( p_stream->i_decoder_specific_info );
+            if( p_stream->p_decoder_specific_info )
+            {
+                memcpy( p_stream->p_decoder_specific_info,
+                        p_input->p_fmt->p_extra,
+                        p_input->p_fmt->i_extra );
+            }
+            else p_stream->i_decoder_specific_info = 0;
+        }
     }
 
     /* Init pes chain */
@@ -2233,7 +2250,13 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
 #endif
 
     if( p_sys->dvbpmt == NULL )
+    {
         p_sys->dvbpmt = malloc( p_sys->i_num_pmt * sizeof(dvbpsi_pmt_t) );
+        if( !p_sys->dvbpmt )
+        {
+            return;
+        }
+    }
 #ifdef HAVE_DVBPSI_SDT
     if( p_sys->b_sdt )
         dvbpsi_InitSDT( &sdt, p_sys->i_tsid, 1, 1, p_sys->i_netid );

diff --git a/src/config/chain.c b/src/config/chain.c
index 029c2555fb49a8ed5373a1378d8d70ca0fa4f66a..fe5e8e6bd30e4740d30485326c831fa6e0e2a12d 100644 (file)
--- a/src/config/chain.c
+++ b/src/config/chain.c
@@ -320,30 +320,6 @@ void __config_ChainParse( vlc_object_t *p_this, const char *psz_prefix,
                  msg_Warn( p_this, "Option %s is obsolete. Use %s instead.",
                            name, psz_name );
             }
-            if( !p_conf->b_safe )
-            {
-                int policy = config_GetInt( p_this, "security-policy" );
-                switch( policy )
-                {
-                    case 0: /* block */
-                        msg_Err( p_this, "option %s is unsafe and is blocked by security policy", psz_name );
-                        return;
-                    case 1: /* allow */
-                        break;
-                    case 2: /* prompt */
-                    {
-                        char description[256];
-                        snprintf(description, sizeof(description), _("playlist item is making use of the following unsafe option '%s', which may be harmful if used in a malicious way, authorize it ?"), psz_name);
-                        if( DIALOG_OK_YES != intf_UserYesNo( p_this, _("WARNING: Unsafe Playlist"), description, _("Yes"), _("No"), NULL) )
-                        {
-                            msg_Err( p_this, "option %s is unsafe and is blocked by security policy", psz_name );
-                            return;
-                        }
-                    }
-                    default:
-                        ;
-                }
-            }
         }
         /* </Check if the option is deprecated> */
 

diff --git a/src/playlist/control.c b/src/playlist/control.c
index edab5f07ebaa6df81ede0bea0154908dd8c8478c..3ff414102bf41d26ffdeeffafce9868499fee1db 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -2,7 +2,7 @@
  * control.c : Handle control of the playlist & running through it
  *****************************************************************************
  * Copyright (C) 1999-2004 the VideoLAN team
- * $Id: /local/vlc/0.8.6-playlist-vlm/src/playlist/playlist.c 13741 2006-03-21T19:29:39.792444Z zorglub  $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Clément Stenac <zorglub@videolan.org>

diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index f3a5cae0287dd6b68435941b7825fe00da6627e8..8ba4278ee08f391b89fdc82a47f3158ac800dbd2 100644 (file)
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -2,7 +2,7 @@
  * playlist_internal.h : Functions for use by the playlist
  *****************************************************************************
  * Copyright (C) 1999-2004 the VideoLAN team
- * $Id: vlc_playlist.h 16505 2006-09-03 21:53:38Z zorglub $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Clément Stenac <zorglub@videolan.org>

diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index e153cea494559b7238a2ab619803d9d911e2fd77..723f628fb04546f4210e3e9abe5a3a25a9a97471 100644 (file)
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -2,7 +2,7 @@
  * stream_output.h : internal stream output
  *****************************************************************************
  * Copyright (C) 2002-2005 the VideoLAN team
- * $Id: stream_output.h 16916 2006-10-01 16:08:37Z dionoea $
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Laurent Aimar <fenrir@via.ecp.fr>

diff --git a/test/native/algo.c b/test/native/algo.c
index 946d259910662396c40a38a61f9ae9a3ec5c2015..9840c8f278a489f61ef70b3932156531231bc42c 100644 (file)
--- a/test/native/algo.c
+++ b/test/native/algo.c
@@ -2,7 +2,7 @@
  * algo.c : Algorithms test
  *****************************************************************************
  * Copyright (C) 2006 VideoLAN
- * $Id: i18n.c 16157 2006-07-29 13:32:12Z zorglub $
+ * $Id$
  *
  * 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