head	1.2;
access;
symbols
	pkgsrc-2015Q3:1.1.0.8
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.6
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.4
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.2
	pkgsrc-2014Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2015.10.25.11.01.13;	author wiz;	state dead;
branches;
next	1.1;
commitid	S7fhp2KUyhezNtGy;

1.1
date	2014.12.13.11.15.45;	author wiz;	state Exp;
branches;
next	;
commitid	jRCnmCUiIzUn2S1y;


desc
@@


1.2
log
@Remove vlc21, vlc is now newer.
@
text
@$NetBSD: patch-ac,v 1.1 2014/12/13 11:15:45 wiz Exp $

--- modules/gui/qt4/components/extended_panels.cpp.orig	2012-04-27 17:14:57.000000000 +0000
+++ modules/gui/qt4/components/extended_panels.cpp
@@@@ -1621,7 +1621,7 @@@@ void SyncControls::update()
 {
     b_userAction = false;
 
-    int64_t i_delay;
+    putime_t i_delay;
     if( THEMIM->getInput() )
     {
         i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" );
@@@@ -1638,7 +1638,7 @@@@ void SyncControls::advanceAudio( double 
 {
     if( THEMIM->getInput() && b_userAction )
     {
-        int64_t i_delay = f_advance * 1000000;
+        putime_t i_delay = f_advance * 1000000;
         var_SetTime( THEMIM->getInput(), "audio-delay", i_delay );
     }
 }
@@@@ -1647,7 +1647,7 @@@@ void SyncControls::advanceSubs( double f
 {
     if( THEMIM->getInput() && b_userAction )
     {
-        int64_t i_delay = f_advance * 1000000;
+        putime_t i_delay = f_advance * 1000000;
         var_SetTime( THEMIM->getInput(), "spu-delay", i_delay );
     }
 }
@


1.1
log
@Import vlc-2.1.5nb1 as multimedia/vlc21 from wip.

VideoLAN is a project of French students from the Ecole Centrale Paris
and developers from all over the world. Its main goals is MPEG streaming
on a network, but it also features a standalone multimedia player. The
VideoLAN Server can stream video read from a hard disk, a DVD player,
a satellite card or an MPEG 2 compression card, and unicast or multicast
it on a network. The VideoLAN Client can read the stream from the network
and display it. It can also be used to display video read locally on
the computer : DVDs, VCDs, MPEG and DivX files and from a satellite
card. It is multi-plaform : Linux, Windows, Mac OS X, BeOS, BSD, Solaris,
QNX, iPaq... The VideoLAN Client and Server now have a full IPv6 support.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.1 2012/08/31 21:00:40 drochner Exp $
@