head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.36
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.34
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.32
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.30
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.28
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.26
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.24
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.22
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.20
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.18
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.16
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.14
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.12
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.10
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.8
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.6
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.4
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.2
	pkgsrc-2006Q1-base:1.2
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2006.02.16.10.27.25;	author abs;	state dead;
branches;
next	1.1;

1.1
date	2006.01.24.04.00.37;	author xtraeme;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2006.01.24.04.00.37;	author xtraeme;	state Exp;
branches;
next	;


desc
@@


1.2
log
@ffmpeg is now 0.4.9pre1
@
text
@$NetBSD: patch-ab,v 1.1 2006/01/24 04:00:37 xtraeme Exp $

--- ffserver.c.orig	2003-09-28 17:26:39.000000000 +0200
+++ ffserver.c
@@@@ -4488,7 +4488,7 @@@@ static void show_help(void)
            "\n"
            "-L            : print the LICENSE\n"
            "-h            : this help\n"
-           "-f configfile : use configfile instead of /etc/ffserver.conf\n"
+           "-f configfile : use configfile instead of " FFSERVER_CONF "\n"
            );
 }
 
@@@@ -4546,7 +4546,7 @@@@ int main(int argc, char **argv)
 
     av_register_all();
 
-    config_filename = "/etc/ffserver.conf";
+    config_filename = FFSERVER_CONF;
 
     my_program_name = argv[0];
     my_program_dir = getcwd(0, 0);
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.2 2004/05/25 21:49:26 wiz Exp $
@


1.1.1.1
log
@Initial import of ffmpeg-devel-0.4.9pre1 from pkgsrc-wip, packaged
by zul at netbsd-fr dot org.

Development version of ffmpeg, required in some new packages or updates.
@
text
@@