You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
vlc/vlc-1.1-backport_20110607.p...

28 lines
860 B

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
}