Changeset 132bf65db16a3496f2b14bb219b90695bdec3b86

Timestamp:

03/02/08 18:37:32 (6 months ago)

Author:

André Weber <WeberAndre@gmx.de>

git-committer:

André Weber <WeberAndre@gmx.de> 1204479452 +0100

git-parent:

[79223aaeafe7ef625f08551700a6ae4d2a26e8b0], [bd9f77136ff0bb6d089880fe9168ce1296fa4d67]

git-author:

André Weber <WeberAndre@gmx.de> 1204479452 +0100

Message:

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

Files:

• .gitignore (modified) (2 diffs)
• extras/contrib/.gitignore (modified) (1 diff)
• extras/contrib/src/Makefile (modified) (1 diff)
• modules/mux/mpeg/ts.c (modified) (6 diffs)
• src/config/chain.c (modified) (1 diff)
• src/playlist/control.c (modified) (1 diff)
• src/playlist/playlist_internal.h (modified) (1 diff)
• src/stream_output/stream_output.h (modified) (1 diff)
• test/native/algo.c (modified) (1 diff)

.gitignore

@@ -3 +3 @@
-*.lo
-*.la
+*.m4
+*.mak
+*.moc.cpp
+*.o
+*.vlt
-.deps
-.libs
+.dirstamp
-ABOUT-NLS
-aclocal.m4
@@ -17 +23 @@
-vlc-config
-vlc-config.in
+qvlc
+rvlc
+svlc
+cvlc
+qvlc
+vlc

extras/contrib/.gitignore

@@ -3 +3 @@
-bin/*
-lib/*
-
+
+
+
-# Ignore fetched contrib
-src/*

extras/contrib/src/Makefile

@@ -1244 +1244 @@
-ifdef HAVE_DARWIN_OS
-    patch -p0 < Patches/goom.patch
+endif
-    patch -p0 < Patches/goom2k4-0-mmx.patch
-endif
-ifdef HAVE_WIN32
-    (cd $@; dos2unix configure.in)

modules/mux/mpeg/ts.c

@@ -893 +893 @@
-
-    p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) );
+    if( !p_input->p_sys )
+        return VLC_ENOMEM;
-
-    /* Init this new stream */
@@ -1022 +1024 @@
-    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] =
@@ -1059 +1067 @@
-            char *psz = p_input->p_fmt->p_extra_languages[i-1].psz_language;
-            const iso639_lang_t *pl = NULL;
-
+
-            if( strlen( psz ) == 2 )
-            {
@@ -1086 +1094 @@
-    }
-
-    /* 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' ) )
@@ -1105 +1102 @@
-        p_stream->p_decoder_specific_info = p =
-            malloc( p_stream->i_decoder_specific_info );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -2234 +2251 @@
-
-    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 )

src/config/chain.c

@@ -321 +321 @@
-                           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> */

src/playlist/control.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
-: /local/vlc/0.8.6-playlist-vlm/src/playlist/playlist.c 13741 2006-03-21T19:29:39.792444Z zorglub  
+
- *
- * Authors: Samuel Hocevar <sam@zoy.org>

src/playlist/playlist_internal.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
-: vlc_playlist.h 16505 2006-09-03 21:53:38Z zorglub 
+
- *
- * Authors: Samuel Hocevar <sam@zoy.org>

src/stream_output/stream_output.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
-: stream_output.h 16916 2006-10-01 16:08:37Z dionoea 
+
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>

test/native/algo.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2006 VideoLAN
-: i18n.c 16157 2006-07-29 13:32:12Z zorglub 
+
- *
- * This program is free software; you can redistribute it and/or modify