diff options
Diffstat (limited to 'multimedia/ffmpeg-devel/files')
11 files changed, 0 insertions, 474 deletions
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 |