[SCM] VLC media player packaging branch, sid, updated. debian/1.0.5-2-6-g3062311
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Thu Apr 22 21:05:32 UTC 2010
The following commit has been merged in the sid branch:
commit 2a1662656d0deed9e23c2d844dbb457093810f4f
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Thu Apr 22 22:06:01 2010 +0200
Remove patches merged upstream
diff --git a/debian/patches/503_jack_input.diff b/debian/patches/503_jack_input.diff
deleted file mode 100644
index 239d294..0000000
--- a/debian/patches/503_jack_input.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 1ee02b3dea0e3d3ac6a00253e8656117a07cca0a
-Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
-Date: Mon Jun 8 18:05:29 2009 +0200
-
- JACK input support for jack2
-
- When you try to capture from JACK, this is only possible with the
- "oldstyle" jackd-0.x. If you want to use the newer, SMP-capable jack2,
- the VLC inputs cannot be connected:
-
- Cannot connect ports owned by inactive clients: "vlc-input-26611" is not
- active
- Cannot connect ports owned by inactive clients: "vlc-input-26611" is not
- active
-
- Unlike jack1, jack2 expects the process callback function to return 0.
-
- The attached patch fixes this problem. It's been already fixed the same
- way in the jack output plugin (see modules/audio_output/jack.c:290).
-
- Taken from Debian bug #532339
- (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532339)
-The attached patch fixes this problem. It's been already fixed the same
- way in the jack output plugin (see modules/audio_output/jack.c:290).
-
- Taken from Debian bug #532339
- (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532339)
-
- Signed-off-by: Christophe Mutricy <xtophe at videolan.org>
-
-Index: vlc-debian/modules/access/jack.c
-===================================================================
---- vlc-debian.orig/modules/access/jack.c 2010-02-13 15:44:11.000000000 +0000
-+++ vlc-debian/modules/access/jack.c 2010-02-13 15:44:27.000000000 +0000
-@@ -405,7 +405,7 @@
- es_out_Send( p_demux->out, p_es, p_block );
- }
-
-- return 1;
-+ return 0;
- }
-
-
diff --git a/debian/patches/504-rtmp-crash.patch b/debian/patches/504-rtmp-crash.patch
deleted file mode 100644
index d52b58b..0000000
--- a/debian/patches/504-rtmp-crash.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 22ef8877c1a7df6a034febb2775be09a9a424bbf
-Author: Christophe Mutricy <xtophe at videolan.org>
-Date: Wed Feb 10 23:31:56 2010 +0000
-
- RTMP: Don't trust the length given by the stream
-
- and fix a null-dereference
-
- Test url: rtmp://cp31335.live.edgefcs.net/live/ (no longer crash but doesn't work)
- (cherry picked from commit d7474341857cf8482e3037648afbe4831590fa8e)
-
-diff --git a/modules/access/rtmp/rtmp_amf_flv.c b/modules/access/rtmp/rtmp_amf_flv.c
-index ed3bd56..acdf9a3 100644
---- a/modules/access/rtmp/rtmp_amf_flv.c
-+++ b/modules/access/rtmp/rtmp_amf_flv.c
-@@ -1147,6 +1147,11 @@ rtmp_handler_invoke( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet
-
- i++; /* Pass over AMF_DATATYPE_STRING */
- string = amf_decode_string( &i );
-+ if( !string )
-+ {
-+ msg_Err(p_thread,"Seriously broken stream");
-+ return;
-+ }
-
- i++; /* Pass over AMF_DATATYPE_NUMBER */
- number = amf_decode_number( &i );
-@@ -2291,6 +2296,9 @@ amf_decode_string( uint8_t **buffer )
- length = ntoh16( *(uint16_t *) *buffer );
- *buffer += sizeof( uint16_t );
-
-+ if( length > sizeof( *buffer ) / sizeof( uint8_t ))
-+ return NULL;
-+
- out = (char *) malloc( length + 1 ); /* '\0' terminated */
- if( !out ) return NULL;
-
diff --git a/debian/patches/505-ftp-crash.patch b/debian/patches/505-ftp-crash.patch
deleted file mode 100644
index 100e169..0000000
--- a/debian/patches/505-ftp-crash.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-commit 4eae7755498cc56d56b5703907717054cbe805e3
-Author: Rémi Denis-Courmont <remi at remlab.net>
-Date: Sun Feb 28 18:53:52 2010 +0200
-
- FTP: handle ftp://HOST correctly
-
- This should fix LP#465560 - segmentation fault in strstr()
- (cherry picked from commit 7056f7113ecf94d1a87a0ee22840f25537ff66ab)
-
-diff --git a/modules/access/ftp.c b/modules/access/ftp.c
-index dffea0d..295c6ac 100644
---- a/modules/access/ftp.c
-+++ b/modules/access/ftp.c
-@@ -305,8 +305,8 @@ static int parseURL( vlc_url_t *url, const char *path )
- /* FTP URLs are relative to user's default directory (RFC1738 §3.2)
- For absolute path use ftp://foo.bar//usr/local/etc/filename */
- /* FIXME: we should issue a series of CWD, one per slash */
-- if( url->psz_path && *url->psz_path == '/' )
-- url->psz_path++;
-+ if( url->psz_path == NULL )
-+ return VLC_SUCCESS;
-
- char *type = strstr( url->psz_path, ";type=" );
- if( type )
-@@ -342,15 +342,16 @@ static int InOpen( vlc_object_t *p_this )
- goto exit_error;
-
- /* get size */
-- if( ftp_SendCommand( p_this, p_sys, "SIZE %s", p_sys->url.psz_path
-- ? p_sys->url.psz_path : "" ) < 0
-+ if( p_sys->url.psz_path == NULL )
-+ p_sys->directory = true;
-+ else
-+ if( ftp_SendCommand( p_this, p_sys, "SIZE %s", p_sys->url.psz_path ) < 0
- || ftp_ReadCommand( p_this, p_sys, NULL, &psz_arg ) != 2 )
- {
- msg_Dbg( p_access, "cannot get file size" );
- msg_Dbg( p_access, "will try to get directory contents" );
-- if( ftp_SendCommand( p_this, p_sys, "CWD %s", p_sys->url.psz_path
-- ? p_sys->url.psz_path : "" ) < 0 ||
-- ftp_ReadCommand( p_this, p_sys, NULL, &psz_arg ) != 2 )
-+ if( ftp_SendCommand( p_this, p_sys, "CWD %s", p_sys->url.psz_path ) < 0
-+ || ftp_ReadCommand( p_this, p_sys, NULL, &psz_arg ) != 2 )
- {
- msg_Err( p_access, "file or directory doesn't exist" );
- net_Close( p_sys->fd_cmd );
-@@ -399,6 +400,11 @@ static int OutOpen( vlc_object_t *p_this )
-
- if( parseURL( &p_sys->url, p_access->psz_path ) )
- goto exit_error;
-+ if( p_sys->url.psz_path == NULL )
-+ {
-+ msg_Err( p_this, "no filename specified" );
-+ goto exit_error;
-+ }
-
- if( Connect( p_this, p_sys ) )
- goto exit_error;
-@@ -514,7 +520,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
- }
- else
- {
-- snprintf( (char*)p_buffer, i_len, "ftp://%s:%d/%s/%s\n",
-+ snprintf( (char*)p_buffer, i_len, "ftp://%s:%d%s/%s\n",
- p_sys->url.psz_host, p_sys->url.i_port,
- p_sys->url.psz_path, psz_line );
- free( psz_line );
-@@ -807,9 +813,10 @@ static int ftp_StartStream( vlc_object_t *p_access, access_sys_t *p_sys,
- else
- {
- /* "1xx" message */
-+ assert( p_sys->url.psz_path );
- if( ftp_SendCommand( p_access, p_sys, "%s %s",
- p_sys->out ? "STOR" : "RETR",
-- p_sys->url.psz_path ? p_sys->url.psz_path : "" ) < 0
-+ p_sys->url.psz_path ) < 0
- || ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) > 2 )
- {
- msg_Err( p_access, "cannot retrieve file" );
diff --git a/debian/patches/series b/debian/patches/series
index 38fa83d..5fb4fc7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,3 @@
401_i420_mmx_pic.diff
501_decrease_alsa_buffer.diff
502_fix_typo.patch
-503_jack_input.diff
-504-rtmp-crash.patch
-505-ftp-crash.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list