diff options
Diffstat (limited to 'multimedia/ffmpeg/files')
4 files changed, 19 insertions, 68 deletions
diff --git a/multimedia/ffmpeg/files/patch-ffmpeg.c b/multimedia/ffmpeg/files/patch-ffmpeg.c deleted file mode 100644 index 0ba5924735c1..000000000000 --- a/multimedia/ffmpeg/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/files/patch-libavcodec::alpha::simple_idct_alpha.c b/multimedia/ffmpeg/files/patch-libavcodec::alpha::simple_idct_alpha.c new file mode 100644 index 000000000000..9595454fd081 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavcodec::alpha::simple_idct_alpha.c @@ -0,0 +1,19 @@ +--- libavcodec/alpha/simple_idct_alpha.c.bak Fri Dec 27 12:35:23 2002 ++++ libavcodec/alpha/simple_idct_alpha.c Tue May 13 21:21:42 2003 +@@ -24,8 +24,16 @@ + * and Falk Hueffner <falk@debian.org> + */ + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ + #include "asm.h" + #include "../dsputil.h" ++ ++#if defined(__FreeBSD__) && __FreeBSD_version < 500000 ++typedef __int32_t int_fast32_t; ++#endif + + extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, + int line_size); diff --git a/multimedia/ffmpeg/files/patch-libavformat::Makefile b/multimedia/ffmpeg/files/patch-libavformat::Makefile deleted file mode 100644 index a24d33a0ad45..000000000000 --- a/multimedia/ffmpeg/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/files/patch-libavformat::avformat.h b/multimedia/ffmpeg/files/patch-libavformat::avformat.h deleted file mode 100644 index 7c3de0a20929..000000000000 --- a/multimedia/ffmpeg/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 |