1:36 p.m.
Author: kwizart
Update of /cvs/free/rpms/vlc/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27225
Modified Files:
vlc.spec vlc-0.8.7-rpmfusion2_head.patch
Log Message:
- libaccess is no more in -core
- More HEAD bugfixes (live555)
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-8/vlc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vlc.spec 16 Sep 2008 08:53:00 -0000 1.6
+++ vlc.spec 23 Sep 2008 13:36:20 -0000 1.7
@@ -20,7 +20,7 @@
Name: vlc
Version: 0.8.7
%define _version 0.8.6i
-Release: 0.3%{?dist}.1
+Release: 0.3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org/
@@ -591,6 +591,7 @@
%{_datadir}/icons/hicolor/*/apps/vlc.png
%{_bindir}/wxvlc
%{_libdir}/vlc/gui/libwxwidgets_plugin.so
+%{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
%{_libdir}/vlc/access/libscreen_plugin.so
%{_libdir}/vlc/misc/libsvg_plugin.so
%{_libdir}/vlc/misc/libnotify_plugin.so
@@ -615,6 +616,7 @@
%exclude %{_libdir}/vlc/gui/libwxwidgets_plugin.so
%exclude %{_libdir}/vlc/gui/libskins2_plugin.so
%exclude %{_datadir}/vlc/skins2
+%exclude %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
%exclude %{_libdir}/vlc/access/libscreen_plugin.so
%exclude %{_libdir}/vlc/misc/libsvg_plugin.so
%exclude %{_libdir}/vlc/misc/libnotify_plugin.so
@@ -665,6 +667,10 @@
%changelog
+* Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.4
+- libaccess is no more in -core
+- More HEAD bugfixes (live555)
+
* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.3
- Update to 20080915 from 0.8.6-bugfix
- BR live555-devel only
vlc-0.8.7-rpmfusion2_head.patch:
Index: vlc-0.8.7-rpmfusion2_head.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/F-8/vlc-0.8.7-rpmfusion2_head.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-0.8.7-rpmfusion2_head.patch 15 Sep 2008 20:12:32 -0000 1.1
+++ vlc-0.8.7-rpmfusion2_head.patch 23 Sep 2008 13:36:20 -0000 1.2
@@ -122,6 +122,46 @@
if( p_access->psz_access && !strcmp( p_access->psz_access,
"mmsh" ) )
{
+diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
+index 90040d3..89ff69b 100644
+--- a/modules/demux/live555.cpp
++++ b/modules/demux/live555.cpp
+@@ -110,7 +110,7 @@ vlc_module_begin();
+ N_("Port to use for tunneling the RTSP/RTP over HTTP."),
+ VLC_TRUE );
+ #endif
+- add_integer("rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
++ add_integer("rtsp-caching", 12 * DEFAULT_PTS_DELAY / 1000, NULL,
+ CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+ add_bool( "rtsp-kasenna", VLC_FALSE, NULL, KASENNA_TEXT,
+ KASENNA_LONGTEXT, VLC_TRUE );
+@@ -1201,6 +1201,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+ {
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int64_t *pi64;
++ int64_t i_time, i_caching;
+ double *pf, f;
+ vlc_bool_t *pb, b_bool;
+
+@@ -1208,8 +1209,16 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+ {
+ case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+- *pi64 = p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start;
+- return VLC_SUCCESS;
++ i_time = p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start;
++ i_caching = var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
++ if( i_time < i_caching )
++ return VLC_EGENERIC;
++ else
++ {
++ *pi64 = i_time - i_caching;
++ printf("time %zd\n", *pi64);
++ return VLC_SUCCESS;
++ }
+
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 31e8f2e..85d6513 100644
--- a/modules/mux/mp4.c