rpms/vlc/devel vlc-1.0-bugfix-bp_zip_qt4.patch, NONE, 1.1 vlc.spec, 1.47, 1.48

Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv29914 Modified Files: vlc.spec Added Files: vlc-1.0-bugfix-bp_zip_qt4.patch Log Message: BP 5 vlc-1.0-bugfix-bp_zip_qt4.patch: --- NEW FILE vlc-1.0-bugfix-bp_zip_qt4.patch --- diff --git a/modules/access/zip/zipstream.c b/modules/access/zip/zipstream.c index 0250312..59b3f74 100644 --- a/modules/access/zip/zipstream.c +++ b/modules/access/zip/zipstream.c @@ -205,8 +205,8 @@ int StreamOpen( vlc_object_t *p_this ) if( !p_sys->zipFile ) { msg_Warn( s, "unable to open file" ); - free( p_sys ); free( p_sys->fileFunctions ); + free( p_sys ); return VLC_EGENERIC; } @@ -214,8 +214,8 @@ int StreamOpen( vlc_object_t *p_this ) char *psz_tmp; if( asprintf( &psz_tmp, "%s.xspf", s->psz_path ) == -1 ) { - free( p_sys ); free( p_sys->fileFunctions ); + free( p_sys ); return VLC_ENOMEM; } p_sys->psz_path = s->psz_path; diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index 97aca1a..31b990a 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -1134,8 +1134,8 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play ) if( s.length() > 0 ) { playlist_Add( THEPL, qtu(s), NULL, - PLAYLIST_APPEND | (first ? PLAYLIST_GO: 0), - PLAYLIST_END, true, false ); + PLAYLIST_APPEND | (first ? PLAYLIST_GO: PLAYLIST_PREPARSE), + PLAYLIST_END, true, pl_Unlocked ); first = false; RecentsMRL::getInstance( p_intf )->addRecent( s ); } Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- vlc.spec 28 Jul 2009 11:03:46 -0000 1.47 +++ vlc.spec 28 Jul 2009 12:16:57 -0000 1.48 @@ -22,6 +22,7 @@ Patch2: 0002-Default-aout-for-pulse.patch Patch3: 300_all_pic.patch Patch4: 310_all_mmx_pic.patch +Patch5: vlc-1.0-bugfix-bp_zip_qt4.patch& BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -236,6 +237,7 @@ %patch3 -p1 -b .dmo_pic sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in %patch4 -p1 -b .mmx_pic +%patch5 -p1 -b .bp5 rm modules/access/videodev2.h