rpms/vlc/devel vlc-1.1-backport_20110607.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 sources, 1.46, 1.47

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22158

Modified Files:
	.cvsignore sources 
Added Files:
	vlc-1.1-backport_20110607.patch 
Log Message:
Add patch from 1.1-bugfix


vlc-1.1-backport_20110607.patch:
 audio_output/pulse.c   |    2 +-
 demux/avformat/demux.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE vlc-1.1-backport_20110607.patch ---
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 7a5ef1f..64de04d 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -273,7 +273,7 @@ static int Open(vlc_object_t *obj)
     aout_instance_t *aout = (aout_instance_t *)obj;
 
 #if !defined(PA_CHECK_VERSION) || !PA_CHECK_VERSION(0,9,22)
-    if( !vlc_xlib_init( p_this ) )
+    if( !vlc_xlib_init( obj ) )
         return VLC_EGENERIC;
 #endif
 
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index fbb0b28..bd7c166 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -210,6 +210,9 @@ int OpenDemux( vlc_object_t *p_this )
        */
        p_sys->url.is_streamed = 1;
        p_sys->io.is_streamed = 1;
+#if defined(AVIO_SEEKABLE_NORMAL)
+       p_sys->io.seekable = 0;
+#endif
     }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	12 Apr 2011 15:47:00 -0000	1.38
+++ .cvsignore	7 Jun 2011 09:15:09 -0000	1.39
@@ -1 +1 @@
-vlc-1.1.9.tar.bz2
+vlc-1.1.10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	12 Apr 2011 15:47:00 -0000	1.46
+++ sources	7 Jun 2011 09:15:09 -0000	1.47
@@ -1 +1 @@
-06adb1848e6b87fbe1ced77ec0f91e4c  vlc-1.1.9.tar.bz2
+066cb94b1e3aa848d828121354d6be4d  vlc-1.1.10.tar.bz2