aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia/ffmpeg-devel/files
diff options
context:
space:
mode:
authorahze <ahze@FreeBSD.org>2007-05-03 22:28:46 +0800
committerahze <ahze@FreeBSD.org>2007-05-03 22:28:46 +0800
commit5f0dc32dde120012ea36e439cb4c8b3676f00839 (patch)
treeb2205b951a5e611c01c854bc450087d9fce63e54 /multimedia/ffmpeg-devel/files
parente599ce0ace6d03a376e7ebff2713a3584248cbdd (diff)
downloadfreebsd-ports-gnome-5f0dc32dde120012ea36e439cb4c8b3676f00839.tar.gz
freebsd-ports-gnome-5f0dc32dde120012ea36e439cb4c8b3676f00839.tar.zst
freebsd-ports-gnome-5f0dc32dde120012ea36e439cb4c8b3676f00839.zip
- Always build libswscale
This fixes build on multimedia/handbrake
Diffstat (limited to 'multimedia/ffmpeg-devel/files')
-rw-r--r--multimedia/ffmpeg-devel/files/patch-libavcode_imgconvert.c18
-rw-r--r--multimedia/ffmpeg-devel/files/patch-libavcodec_Makefile12
2 files changed, 30 insertions, 0 deletions
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcode_imgconvert.c b/multimedia/ffmpeg-devel/files/patch-libavcode_imgconvert.c
new file mode 100644
index 000000000000..5a985ae7be0f
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-libavcode_imgconvert.c
@@ -0,0 +1,18 @@
+--- libavcodec/imgconvert.c.orig Thu May 3 09:07:28 2007
++++ libavcodec/imgconvert.c Thu May 3 09:08:25 2007
+@@ -2319,7 +2319,6 @@
+ }
+ #endif
+
+-#ifndef CONFIG_SWSCALER
+ /* XXX: always use linesize. Return -1 if not supported */
+ int img_convert(AVPicture *dst, int dst_pix_fmt,
+ const AVPicture *src, int src_pix_fmt,
+@@ -2561,7 +2560,6 @@
+ avpicture_free(tmp);
+ return ret;
+ }
+-#endif
+
+ /* NOTE: we scan all the pixels to have an exact information */
+ static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec_Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec_Makefile
new file mode 100644
index 000000000000..e48db852bb7d
--- /dev/null
+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec_Makefile
@@ -0,0 +1,12 @@
+--- libavcodec/Makefile.orig Thu May 3 08:50:33 2007
++++ libavcodec/Makefile Thu May 3 08:50:42 2007
+@@ -293,9 +293,7 @@
+
+ OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
+
+-ifneq ($(CONFIG_SWSCALER),yes)
+ OBJS += imgresample.o
+-endif
+
+ # processor-specific code
+ ifeq ($(TARGET_MMX),yes)