summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg
diff options
context:
space:
mode:
authorwiz <wiz>2006-06-26 19:39:54 +0000
committerwiz <wiz>2006-06-26 19:39:54 +0000
commitb91a598d019ca786aaab3234272220a2905f8d17 (patch)
treecc345a848c03b74abb874266ae1896c4c099c973 /multimedia/ffmpeg
parent8317ddee77e80b500a67871ccbd6d8cd6b9cac12 (diff)
downloadpkgsrc-b91a598d019ca786aaab3234272220a2905f8d17.tar.gz
regen (offsets)
Diffstat (limited to 'multimedia/ffmpeg')
-rw-r--r--multimedia/ffmpeg/patches/patch-ab8
-rw-r--r--multimedia/ffmpeg/patches/patch-ae10
2 files changed, 9 insertions, 9 deletions
diff --git a/multimedia/ffmpeg/patches/patch-ab b/multimedia/ffmpeg/patches/patch-ab
index 6e181d87ca9..214ef626486 100644
--- a/multimedia/ffmpeg/patches/patch-ab
+++ b/multimedia/ffmpeg/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/02/16 10:26:30 abs Exp $
+$NetBSD: patch-ab,v 1.4 2006/06/26 19:39:54 wiz Exp $
---- ffserver.c.orig 2003-09-28 17:26:39.000000000 +0200
+--- ffserver.c.orig 2004-05-29 02:06:31.000000000 +0000
+++ ffserver.c
-@@ -4488,7 +4488,7 @@ static void show_help(void)
+@@ -4375,7 +4375,7 @@ static void show_help(void)
"\n"
"-L : print the LICENSE\n"
"-h : this help\n"
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2006/02/16 10:26:30 abs Exp $
);
}
-@@ -4546,7 +4546,7 @@ int main(int argc, char **argv)
+@@ -4433,7 +4433,7 @@ int main(int argc, char **argv)
av_register_all();
diff --git a/multimedia/ffmpeg/patches/patch-ae b/multimedia/ffmpeg/patches/patch-ae
index 5e9b11f8a26..650539dba16 100644
--- a/multimedia/ffmpeg/patches/patch-ae
+++ b/multimedia/ffmpeg/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2006/02/16 10:26:30 abs Exp $
+$NetBSD: patch-ae,v 1.5 2006/06/26 19:39:54 wiz Exp $
---- libavcodec/Makefile.orig 2003-09-28 17:26:39.000000000 +0200
+--- libavcodec/Makefile.orig 2004-06-18 13:11:15.000000000 +0000
+++ libavcodec/Makefile
-@@ -145,6 +145,9 @@ SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
+@@ -180,6 +180,9 @@ SLIB= $(SLIBPREF)avcodec$(SLIBSUF)
endif
TESTS= imgresample-test dct-test motion-test fft-test
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.4 2006/02/16 10:26:30 abs Exp $
all: $(LIB) $(SLIB)
amrlibs:
-@@ -154,8 +157,8 @@ tests: apiexample cpuid_test $(TESTS)
+@@ -189,8 +192,8 @@ tests: apiexample cpuid_test $(TESTS)
$(LIB): $(OBJS) $(AMRLIBS)
rm -f $@
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.4 2006/02/16 10:26:30 abs Exp $
$(SLIB): $(OBJS)
ifeq ($(CONFIG_WIN32),yes)
-@@ -171,13 +174,10 @@ libpostproc/libpostproc.a:
+@@ -206,13 +209,10 @@ libpostproc/libpostproc.a:
$(MAKE) -C libpostproc
%.o: %.c