16 files changed, 0 insertions, 754 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
deleted file mode 100644
index 801a6d6553d0..000000000000
--- a/multimedia/ffmpeg-devel/Makefile
+++ /dev/null
@@ -1,210 +0,0 @@
-# New ports collection makefile for:	ffmpeg
-# Date created:		Tue Sep 25 15:52:09 BRT 2001
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ffmpeg
-PORTVERSION=	0.4.6
-PORTREVISION=	3
-CATEGORIES=	multimedia audio net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ffmpeg
-
-MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	Hyper fast realtime audio/video encoder/converter, streaming server
-
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-CONFIGURE_ARGS= --cc="${CC}" --prefix="${PREFIX}" \
-		--make="${GMAKE}" --enable-shared \
-		--extra-libs="-lm -L${LOCALBASE}/lib"
-PLIST_SUB=	SHLIB_VERSION=${SHLIB_VERSION}
-INSTALLS_SHLIB=	yes
-
-SHLIB_VERSION=	0
-#
-DOC_FILES=	COPYING Changelog README VERSION
-# under subdir doc
-DOC_DOCFILES=	TODO \
-		faq.html faq.texi \
-		ffmpeg-doc.html ffmpeg-doc.texi \
-		ffserver-doc.html ffserver-doc.texi
-HEADER_FILES=	libavcodec/avcodec.h libavcodec/common.h \
-		libavcodec/dsputil.h
-LIB_FILES=	libavcodec/libavcodec.a libavformat/libavformat.a
-
-.include <bsd.port.pre.mk>
-
-##
-## arch detection
-##
-.if ${ARCH} != "i386"
-WITHOUT_MMX=	yes
-.endif
-
-## lib detection
-##
-##
-.if exists(${X11BASE}/lib/libImlib2.so)
-WITH_IMLIB2=yes
-.endif
-## lame mp3
-.if exists(${LOCALBASE}/lib/libmp3lame.so.0)
-WITH_MP3=yes
-.endif
-## vorbis
-.if exists(${LOCALBASE}/lib/libvorbisenc.so.2)
-WITH_VORBIS=yes
-.endif
-
-## support activation
-##
-## disable a52
-.ifndef(WITHOUT_A52)
-LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
-
-CONFIGURE_ARGS+=	--enable-a52 \
-			--enable-a52bin
-.else
-CONFIGURE_ARGS+=	--enable-a52 \
-			--disable-a52bin
-.endif
-## enable imlib2
-.if !defined(WITHOUT_VHOOK) && defined(WITH_IMLIB2)
-LIB_DEPENDS+=	Imlib2.1:${PORTSDIR}/graphics/imlib2
-
-PLIST_SUB+=	IMLIB2=""
-.else
-PLIST_SUB+=	IMLIB2="@comment "
-.endif
-## disable mmx
-.ifdef(WITHOUT_MMX)
-CONFIGURE_ARGS+=	--disable-mmx
-.endif
-## mp3
-.ifdef(WITH_MP3)
-LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame
-
-CONFIGURE_ARGS+=	--enable-mp3lame
-.endif
-## optimization
-.ifdef(WITH_OPTIMIZED_CFLAGS)
-CONFIGURE_ARGS+=	--extra-cflags="${CFLAGS} -I${LOCALBASE}/include \
-				-O3 -ffast-math -fomit-frame-pointer"
-.else
-CONFIGURE_ARGS+=	--extra-cflags="${CFLAGS} -I${LOCALBASE}/include"
-.endif
-## vhook
-.ifndef(WITHOUT_VHOOK)
-PLIST_SUB+=	VHOOK=""
-.else
-CONFIGURE_ARGS+=	-disable-vhook
-
-PLIST_SUB+=	VHOOK="@comment "
-.endif
-## vorbis
-.ifdef(WITH_VORBIS)
-LIB_DEPENDS+=		vorbisenc.2:${PORTSDIR}/audio/libvorbis
-
-CONFIGURE_ARGS+=	--enable-vorbis
-.endif
-
-pre-everything::
-.ifndef(WITHOUT_LIBA52)
-	@${ECHO_MSG} "You can disable liba52 support by defining WITHOUT_LIBA52"
-.endif
-.ifndef(WITHOUT_MMX)
-	@${ECHO_MSG} "Define WITHOUT_MMX if your system does not support MMX"
-.endif
-.ifndef(WITH_MP3)
-	@${ECHO_MSG} 'Define WITH_MP3 to enable lame MP3 codec'
-.endif
-.ifndef(WITH_OPTIMIZED_CFLAGS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} 'You can enable additional compilation optimizations'
-	@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
-.endif
-.ifndef(WITHOUT_VHOOK)
-	@${ECHO_MSG}
-	@${ECHO_MSG} 'You can disable vhook support by defining WITHOUT_VHOOK'
-.endif
-.ifndef(WITH_VORBIS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} 'Define WITH_VORBIS to enable libvorbisenc VORBIS codec'
-.endif
-.if !(defined(WITH_BKTR_FORMAT) && defined(WITH_BKTR_DEV))
-	@${ECHO_MSG}
-	@${ECHO_MSG} 'If you want to capture from a bktr(4) supported card'
-	@${ECHO_MSG} 'you will probably need to set the input device and format'
-	@${ECHO_MSG} 'You can set WITH_BKTR_FORMAT to NTSC or PAL and you can set'
-	@${ECHO_MSG} 'WITH_BKTR_DEV to 0, 1, 2 or 3 (1 is usually the tuner)'
-	@${ECHO_MSG} 'so for a PAL tuner make WITH_BKTR_FORMAT=PAL WITH_BKTR_DEV=1'
-	@${ECHO_MSG}
-	@${ECHO_MSG} 'Warning: invalid settings will probably dump cores'
-	@${ECHO_MSG}
-.endif
-
-post-extract:
-# install booktree extension
-	@${CP} ${FILESDIR}/grab_bsdbktr.c ${WRKSRC}/libavformat/
-
-post-patch:
-	@${REINPLACE_CMD} -e "s!/etc/ffserver.conf!${PREFIX}/etc/ffserver.conf!g" \
-		${WRKSRC}/ffserver.c
-# we support "v4l" per default through Steve O'Hara-Smith's bktr(4)
-# patch
-	@${REINPLACE_CMD} -E -e \
-		's|^(v4l).*$$|\1="yes"|' \
-		${WRKSRC}/configure
-# malloc.h was deprecated in favor of stdlib.h
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -e \
-		's|malloc.h|stdlib.h|'
-.ifdef(WITH_BKTR_FORMAT)
-	@${REINPLACE_CMD} -e \
-		"s!VIDEO_FORMAT NTSC!VIDEO_FORMAT ${WITH_BKTR_FORMAT}!" \
-		${WRKSRC}/libavformat/grab_bsdbktr.c
-.endif
-.ifdef(WITH_BKTR_DEV)
-	@${REINPLACE_CMD} -e \
-		"s!VIDEO_INPUT METEOR_INPUT_DEV0!VIDEO_INPUT METEOR_INPUT_DEV${WITH_BKTR_DEV}!" \
-		${WRKSRC}/libavformat/grab_bsdbktr.c
-.endif
-.ifndef(WITHOUT_LIBA52)
-	@${REINPLACE_CMD} -e 's|-ldl||' \
-		${WRKSRC}/configure
-.endif
-
-post-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.for file in ${DOC_DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
-.endif
-	@${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
-		${PREFIX}/etc/ffserver.conf.sample
-.for file in ${HEADER_FILES}
-# fix header references prior to installation
-	@${REINPLACE_CMD} -e 's|"common.h"|<ffmpeg/common.h>|; \
-		s|"avcodec.h"|<ffmpeg/avcodec.h>|' \
-		${WRKSRC}/${file}
-	@${INSTALL_DATA} ${WRKSRC}/${file} \
-		${PREFIX}/include/ffmpeg/${file:T}
-.endfor
-.for file in ${LIB_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/${file:T}
-.endfor
-# add shared lib link
-	@${LN} -sf libavcodec.so \
-		${PREFIX}/lib/libavcodec.so.${SHLIB_VERSION}
-
-.include <bsd.port.post.mk>
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
deleted file mode 100644
index ade63a0daf30..000000000000
--- a/multimedia/ffmpeg-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ffmpeg-0.4.6.tar.gz) = bdd96d28327d3abe02e886c13e633878
diff --git a/multimedia/ffmpeg-devel/files/extra-bktr-patch-ffmpeg.c b/multimedia/ffmpeg-devel/files/extra-bktr-patch-ffmpeg.c
deleted file mode 100644
index 0ba5924735c1..000000000000
--- a/multimedia/ffmpeg-devel/files/extra-bktr-patch-ffmpeg.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- ffmpeg.c.orig	Wed Jan  1 20:56:06 2003
-+++ ffmpeg.c	Wed Jan  1 20:56:41 2003
-@@ -35,6 +35,7 @@
- #define INFINITY HUGE_VAL
- #endif
- 
-+#define INT64_C(x) x##LL
- #define MAXINT64 INT64_C(0x7fffffffffffffff)
- 
- typedef struct {
-@@ -158,7 +159,7 @@
- const char *audio_device = "none";
- #endif
- #ifndef CONFIG_VIDEO4LINUX
--const char *v4l_device = "none";
-+const char *video_device = "none";
- #endif
- 
- typedef struct AVOutputStream {
-@@ -1842,7 +1843,7 @@
- 
- void opt_video_device(const char *arg)
- {
--    v4l_device = strdup(arg);
-+    video_device = strdup(arg);
- }
- 
- void opt_audio_device(const char *arg)
-@@ -2428,7 +2429,7 @@
-         /* by now video grab has one stream */
-         ic->streams[0]->r_frame_rate = ap->frame_rate;
-         input_files[nb_input_files] = ic;
--        dump_format(ic, nb_input_files, v4l_device, 0);
-+        dump_format(ic, nb_input_files, video_device, 0);
-         nb_input_files++;
-     }
-     if (has_audio) {
diff --git a/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile
deleted file mode 100644
index a24d33a0ad45..000000000000
--- a/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- libavformat/Makefile.orig	Wed Jan  1 21:00:22 2003
-+++ libavformat/Makefile	Wed Jan  1 21:01:27 2003
-@@ -6,7 +6,7 @@
- 
- VPATH=$(SRC_PATH)/libavformat
- 
--CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-+CFLAGS= $(OPTFLAGS) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= utils.o cutils.o allformats.o
- 
-@@ -21,7 +21,7 @@
- endif
- 
- ifeq ($(CONFIG_VIDEO4LINUX),yes)
--OBJS+= grab.o
-+OBJS+= grab_bsdbktr.o
- endif
- 
- ifeq ($(CONFIG_AUDIO_OSS),yes)
diff --git a/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::avformat.h b/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::avformat.h
deleted file mode 100644
index 7c3de0a20929..000000000000
--- a/multimedia/ffmpeg-devel/files/extra-bktr-patch-libavformat::avformat.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavformat/avformat.h.orig	Wed Jan  1 21:03:56 2003
-+++ libavformat/avformat.h	Wed Jan  1 21:04:02 2003
-@@ -329,7 +329,7 @@
- int video_grab_init(void);
- int audio_init(void);
- 
--extern const char *v4l_device;
-+extern const char *video_device;
- extern const char *audio_device;
- 
- #ifdef HAVE_AV_CONFIG_H
diff --git a/multimedia/ffmpeg-devel/files/grab_bsdbktr.c b/multimedia/ffmpeg-devel/files/grab_bsdbktr.c
deleted file mode 100644
index 2dc397a8d804..000000000000
--- a/multimedia/ffmpeg-devel/files/grab_bsdbktr.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * FreeBSD video grab interface
- * Copyright (c) 2002 Steve O'Hara-Smith
- * based on
- *           Linux video grab interface
- *           Copyright (c) 2000,2001 Gerard Lantau.
- * and
- *           simple_grab.c Copyright (c) 1999 Roger Hardiman
- *
- * GPL virus inherited:
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include "avformat.h"
-#include <machine/ioctl_meteor.h>
-#include <machine/ioctl_bt848.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/time.h>
-#include <signal.h>
-
-typedef struct {
-	int fd;
-	int tuner_fd;
-	int frame_format; /* see VIDEO_PALETTE_xxx */
-	int width, height;
-	int frame_rate;
-	INT64 per_frame;
-	INT64 last_frame_time;
-} VideoData;
-
-const char *video_device = "/dev/bktr0";
-
-#define PAL 1
-#define PALBDGHI 1
-#define NTSC 2
-#define NTSCM 2
-#define SECAM 3
-#define PALN 4
-#define PALM 5
-#define NTSCJ 6
-
-/* PAL is 768 x 576. NTSC is 640 x 480 */
-#define PAL_HEIGHT 576
-#define SECAM_HEIGHT 576
-#define NTSC_HEIGHT 480
-
-#ifndef VIDEO_FORMAT
-#define VIDEO_FORMAT NTSC
-#endif
-
-#ifndef VIDEO_INPUT
-#define VIDEO_INPUT METEOR_INPUT_DEV0;
-#endif
-
-static UINT8 *video_buf;
-static int nsignals = 0;
-static void catchsignal(int signal)
-{
-	nsignals++;
-	return;
-}
-
-static int bktr_init(AVFormatContext *s1,  AVFormatParameters *ap)
-{
-	VideoData *s = s1->priv_data;
-	int width, height, h_max;
-	int video_fd;
-	int format = VIDEO_FORMAT;
-	struct meteor_geomet geo;
-	int c;
-	struct sigaction act,old;
-
-	memset(&act,0,sizeof(act));
-	sigemptyset(&act.sa_mask);
-	act.sa_handler  = catchsignal;
-	sigaction(SIGUSR1,&act,&old);
-	sigaction(SIGALRM,&act,&old);
-
-	width = s->width;
-	height = s->height;
-	s->last_frame_time = 0;
-
-	s->tuner_fd = open ("/dev/tuner0", O_RDONLY);
-	if (s->tuner_fd < 0) {
-		perror("Warning: Tuner not opened continuing");
-	}
-
-	video_fd = open(video_device, O_RDONLY);
-	if (video_fd < 0) {
-		perror(video_device);
-		return -EIO;
-	}
-	s->fd=video_fd;
-	geo.rows = height;
-	geo.columns = width;
-	geo.frames = 1;
-	geo.oformat = METEOR_GEO_YUV_422 | METEOR_GEO_YUV_12;
-
-	switch (format) {
-	case PAL:   h_max = PAL_HEIGHT;   c = BT848_IFORM_F_PALBDGHI; break;
-	case PALN:  h_max = PAL_HEIGHT;   c = BT848_IFORM_F_PALN;     break;
-	case PALM:  h_max = PAL_HEIGHT;   c = BT848_IFORM_F_PALM;     break;
-	case SECAM: h_max = SECAM_HEIGHT; c = BT848_IFORM_F_SECAM;    break;
-	case NTSC:  h_max = NTSC_HEIGHT;  c = BT848_IFORM_F_NTSCM;    break;
-	case NTSCJ: h_max = NTSC_HEIGHT;  c = BT848_IFORM_F_NTSCJ;    break;
-	default:    h_max = PAL_HEIGHT;   c = BT848_IFORM_F_PALBDGHI; break;
-	}
-	if (height <= h_max/2) {
-		geo.oformat |= METEOR_GEO_EVEN_ONLY;
-	}
-
-	if (ioctl(video_fd, METEORSETGEO, &geo) < 0) {
-		perror ("METEORSETGEO");
-		return -EIO;
-	}
-
-	if (ioctl(video_fd, BT848SFMT, &c) < 0) {
-		perror ("BT848SFMT");
-		return -EIO;
-	}
-
-	c = VIDEO_INPUT;
-	if (ioctl(video_fd, METEORSINPUT, &c) < 0) {
-		perror ("METEORSINPUT");
-		return -EIO;
-	}
-	video_buf = mmap((caddr_t)0, width*height*3, PROT_READ, MAP_SHARED,
-	                 video_fd, (off_t) 0);
-	if (video_buf == MAP_FAILED) {
-		perror ("mmap");
-		return -EIO;
-	}
-	c = METEOR_CAP_CONTINOUS;
-	ioctl(s->fd, METEORCAPTUR, &c);
-	c = SIGUSR1;
-	ioctl (s->fd, METEORSSIGNAL, &c);
-	return 0;
-}
-
-/* note: we support only one picture read at a time */
-static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
-{
-	VideoData *s = s1->priv_data;
-	int size, halfsize;
-	UINT64 curtime;
-
-	size = s->width * s->height;
-	halfsize = size << 1;
-	if (av_new_packet(pkt, size + halfsize) < 0)
-		return -EIO;
-
-	curtime = av_gettime();
-	if (!s->last_frame_time
-	    || ((s->last_frame_time + s->per_frame) > curtime)) {
-		if (!usleep (s->last_frame_time + s->per_frame + s->per_frame/8 - curtime)) {
-			if (!nsignals)
-				printf ("\nSLEPT NO signals - %d microseconds late\n",
-				        av_gettime() - s->last_frame_time - s->per_frame);
-		}
-	}
-	nsignals = 0;
-
-	s->last_frame_time = curtime;
-	pkt->pts = curtime & ((1LL << 48) - 1);
-	memcpy (pkt->data, video_buf, size + halfsize);
-	return size + halfsize;
-}
-
-static int grab_read_header (AVFormatContext *s1,  AVFormatParameters *ap)
-{
-	VideoData *s = s1->priv_data;
-	AVStream *st;
-	int width, height;
-	int frame_rate;
-
-	if (!ap || ap->width <= 0 || ap->height <= 0 || ap->frame_rate <= 0)
-		return -1;
-
-	width = ap->width;
-	height = ap->height;
-	frame_rate = ap->frame_rate;
-	st = av_new_stream(s1, 0);
-	if (!st)
-		return -ENOMEM;
-	s1->priv_data = s;
-	s1->nb_streams = 1;
-	s1->streams[0] = st;
-
-	s->width = width;
-	s->height = height;
-	s->frame_rate = frame_rate;
-	s->per_frame = (INT64_C(1000000) * FRAME_RATE_BASE) / s->frame_rate;
-	st->codec.pix_fmt = PIX_FMT_YUV420P;
-	st->codec.codec_id = CODEC_ID_RAWVIDEO;
-	st->codec.width = width;
-	st->codec.height = height;
-	st->codec.frame_rate = frame_rate;
-
-	av_set_pts_info(s1, 48, 1, 1000000); /* 48 bits pts in us */
-
-	return bktr_init(s1, ap);
-}
-
-static int grab_read_close (AVFormatContext *s1)
-{
-	VideoData *s = s1->priv_data;
-
-	int c = METEOR_CAP_STOP_CONT;
-	ioctl(s->fd, METEORCAPTUR, &c);
-	close(s->fd);
-	close(s->tuner_fd);
-	free(s);
-	return 0;
-}
-
-AVInputFormat video_grab_device_format = {
-	"video_grab_device",
-	"video grab",
-	 sizeof(VideoData),
-	 NULL,
-	grab_read_header,
-	grab_read_packet,
-	grab_read_close,
-	flags: AVFMT_NOFILE,
-};
-
-int video_grab_init(void)
-{
-	av_register_input_format(&video_grab_device_format);
-	return 0;
-}
diff --git a/multimedia/ffmpeg-devel/files/patch-Makefile b/multimedia/ffmpeg-devel/files/patch-Makefile
deleted file mode 100644
index b3c67ee98c4c..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig	Wed Jan  1 20:51:57 2003
-+++ Makefile	Wed Jan  1 20:52:27 2003
-@@ -6,8 +6,7 @@
- 
- VPATH=$(SRC_PATH)
- 
--CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
--LDFLAGS+= -g 
-+CFLAGS= $(OPTFLAGS) -Wall -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- ifeq ($(TARGET_GPROF),yes)
- CFLAGS+=-p
diff --git a/multimedia/ffmpeg-devel/files/patch-ffmpeg.c b/multimedia/ffmpeg-devel/files/patch-ffmpeg.c
deleted file mode 100644
index 0ba5924735c1..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-ffmpeg.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- ffmpeg.c.orig	Wed Jan  1 20:56:06 2003
-+++ ffmpeg.c	Wed Jan  1 20:56:41 2003
-@@ -35,6 +35,7 @@
- #define INFINITY HUGE_VAL
- #endif
- 
-+#define INT64_C(x) x##LL
- #define MAXINT64 INT64_C(0x7fffffffffffffff)
- 
- typedef struct {
-@@ -158,7 +159,7 @@
- const char *audio_device = "none";
- #endif
- #ifndef CONFIG_VIDEO4LINUX
--const char *v4l_device = "none";
-+const char *video_device = "none";
- #endif
- 
- typedef struct AVOutputStream {
-@@ -1842,7 +1843,7 @@
- 
- void opt_video_device(const char *arg)
- {
--    v4l_device = strdup(arg);
-+    video_device = strdup(arg);
- }
- 
- void opt_audio_device(const char *arg)
-@@ -2428,7 +2429,7 @@
-         /* by now video grab has one stream */
-         ic->streams[0]->r_frame_rate = ap->frame_rate;
-         input_files[nb_input_files] = ic;
--        dump_format(ic, nb_input_files, v4l_device, 0);
-+        dump_format(ic, nb_input_files, video_device, 0);
-         nb_input_files++;
-     }
-     if (has_audio) {
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
deleted file mode 100644
index d760d0cee046..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- libavcodec/Makefile.orig	Sun Oct  6 12:26:38 2002
-+++ libavcodec/Makefile	Wed Oct  9 14:24:34 2002
-@@ -7,8 +7,7 @@
- VPATH=$(SRC_PATH)/libavcodec
- 
- # NOTE: -I.. is needed to include config.h
--CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
--LDFLAGS= -g
-+CFLAGS= $(OPTFLAGS) -Wall -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= common.o utils.o mem.o allcodecs.o \
-       mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
-@@ -167,8 +166,7 @@
- install: all
- ifeq ($(BUILD_SHARED),yes)
- 	install -d $(prefix)/lib
--	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
--	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
-+	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so
- 	ldconfig || true
- 	mkdir -p $(prefix)/include/ffmpeg
- 	install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h b/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h
deleted file mode 100644
index 7205d7e7a87b..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavcodec::bswap.h
+++ /dev/null
@@ -1,41 +0,0 @@
---- libavcodec/bswap.h.orig	Sun Nov  3 04:51:51 2002
-+++ libavcodec/bswap.h	Sun Nov  3 04:53:30 2002
-@@ -5,6 +5,14 @@
- #include <byteswap.h>
- #else
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#include <sys/endian.h>
-+#endif
-+
- #ifdef ARCH_X86
- inline static unsigned short ByteSwap16(unsigned short x)
- {
-@@ -13,7 +21,11 @@
-         "0" (x));
-     return x;
- }
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#define bswap_16(x) (be16toh(x))
-+#else
- #define bswap_16(x) ByteSwap16(x)
-+#endif
- 
- inline static unsigned int ByteSwap32(unsigned int x)
- {
-@@ -29,7 +41,11 @@
-       "0" (x));
-   return x;
- }
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 470000
-+#define bswap_32(x) (be32toh(x))
-+#else
- #define bswap_32(x) ByteSwap32(x)
-+#endif
- 
- inline static unsigned long long int ByteSwap64(unsigned long long int x)
- {
diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile b/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
deleted file mode 100644
index a24d33a0ad45..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavformat::Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- libavformat/Makefile.orig	Wed Jan  1 21:00:22 2003
-+++ libavformat/Makefile	Wed Jan  1 21:01:27 2003
-@@ -6,7 +6,7 @@
- 
- VPATH=$(SRC_PATH)/libavformat
- 
--CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-+CFLAGS= $(OPTFLAGS) -Wall -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= utils.o cutils.o allformats.o
- 
-@@ -21,7 +21,7 @@
- endif
- 
- ifeq ($(CONFIG_VIDEO4LINUX),yes)
--OBJS+= grab.o
-+OBJS+= grab_bsdbktr.o
- endif
- 
- ifeq ($(CONFIG_AUDIO_OSS),yes)
diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::audio.c b/multimedia/ffmpeg-devel/files/patch-libavformat::audio.c
deleted file mode 100644
index 375a58dd7280..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavformat::audio.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- libavformat/audio.c.orig	Wed Feb  5 20:49:08 2003
-+++ libavformat/audio.c	Wed Feb  5 20:50:36 2003
-@@ -243,6 +243,14 @@
-     if (av_new_packet(pkt, s->frame_size) < 0)
-         return -EIO;
-     for(;;) {
-+        struct timeval tv;
-+        fd_set fds;
-+        tv.tv_sec = 0;
-+        tv.tv_usec = 30 * 1000; /* 30 msecs -- a bit shorter than 1 frame at 30fps */
-+        FD_ZERO(&fds);
-+        FD_SET(s->fd, &fds);    /* This will block until data is available or we get a timeout */
-+        (void) select(s->fd + 1, &fds, 0, 0, &tv);
-+
-         ret = read(s->fd, pkt->data, pkt->size);
-         if (ret > 0)
-             break;
diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat::avformat.h b/multimedia/ffmpeg-devel/files/patch-libavformat::avformat.h
deleted file mode 100644
index 7c3de0a20929..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libavformat::avformat.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavformat/avformat.h.orig	Wed Jan  1 21:03:56 2003
-+++ libavformat/avformat.h	Wed Jan  1 21:04:02 2003
-@@ -329,7 +329,7 @@
- int video_grab_init(void);
- int audio_init(void);
- 
--extern const char *v4l_device;
-+extern const char *video_device;
- extern const char *audio_device;
- 
- #ifdef HAVE_AV_CONFIG_H
diff --git a/multimedia/ffmpeg-devel/pkg-descr b/multimedia/ffmpeg-devel/pkg-descr
deleted file mode 100644
index cdb037459048..000000000000
--- a/multimedia/ffmpeg-devel/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-[ excerpt (with adaptations) from developer's README ]
-ffmpeg is a hyper fast realtime audio/video encoder, a streaming
-server and a generic audio and video file converter.
-
-It can convert a standard video source into several file formats
-based on DCT/motion compensation encoding. Sound is compressed in
-MPEG audio layer 2 or using an AC3 compatible stream.
-
-What makes ffmpeg interesting ?
-- Simple and efficient video encoder: outputs MPEG1, H263, Real
-  Video(tm), MPEG4, DIVX and MJPEG compatible bitstreams using the
-  same encoder core.
-- Hyper fast MPEG audio layer 2 compression (50 times faster than
-  realtime on a K6 500).
-[snip -> rest on website below]
-
-ffmpeg is made of two programs:
-* ffmpeg: soft VCR which encodes in real time to several formats.
-  It can also encode from any supported input file format to any
-  input supported format.
-* ffserver: high performance live broadcast streaming server based
-  on the ffmpeg core encoders.
-
-WWW: http://ffmpeg.sourceforge.net/
diff --git a/multimedia/ffmpeg-devel/pkg-message b/multimedia/ffmpeg-devel/pkg-message
deleted file mode 100644
index cb70ec87a6b5..000000000000
--- a/multimedia/ffmpeg-devel/pkg-message
+++ /dev/null
@@ -1,17 +0,0 @@
-	ATTENTIONATTENTION:
-
-ffmpeg users have reported that older version 0.4.5 encodes faster
-than later ffmpeg versions. Therefore, it might prove better for
-capturing purposes with Brooktree bktr(4) devices. So, if you want
-the additional speed, you might want to try using the ffmpeg045
-port. The current ffmpeg port should be used for all other purposes
-unless you really need the additional speed.
-
-Do not install both ports at the same time. They install conflicting
-files.
-
-- ffmpeg 0.4.5
-ports/multimedia/ffmpeg045
-
-- ffmpeg current
-ports/multimedia/ffmpeg
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
deleted file mode 100644
index ee83d16ccff5..000000000000
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-bin/ffmpeg
-bin/ffplay
-bin/ffserver
-etc/ffserver.conf.sample
-include/ffmpeg/avcodec.h
-include/ffmpeg/common.h
-include/ffmpeg/dsputil.h
-lib/libavcodec.a
-lib/libavcodec.so
-lib/libavcodec.so.%%SHLIB_VERSION%%
-lib/libavformat.a
-%%VHOOK%%lib/vhook/fish.so
-%%VHOOK%%%%IMLIB2%%lib/vhook/imlib2.so
-%%VHOOK%%lib/vhook/null.so
-%%PORTDOCS%%share/doc/ffmpeg/COPYING
-%%PORTDOCS%%share/doc/ffmpeg/Changelog
-%%PORTDOCS%%share/doc/ffmpeg/README
-%%PORTDOCS%%share/doc/ffmpeg/TODO
-%%PORTDOCS%%share/doc/ffmpeg/VERSION
-%%PORTDOCS%%share/doc/ffmpeg/faq.html
-%%PORTDOCS%%share/doc/ffmpeg/faq.texi
-%%PORTDOCS%%share/doc/ffmpeg/ffmpeg-doc.html
-%%PORTDOCS%%share/doc/ffmpeg/ffmpeg-doc.texi
-%%PORTDOCS%%share/doc/ffmpeg/ffserver-doc.html
-%%PORTDOCS%%share/doc/ffmpeg/ffserver-doc.texi
-%%PORTDOCS%%@dirrm share/doc/ffmpeg
-%%VHOOK%%@dirrm lib/vhook
-@dirrm include/ffmpeg