diff options
| author | sborrill <sborrill> | 2008-09-15 21:24:00 +0000 |
|---|---|---|
| committer | sborrill <sborrill> | 2008-09-15 21:24:00 +0000 |
| commit | 6530322f7a9416c1b0404cf856f6569492b23033 (patch) | |
| tree | 2f888e69efacead0ffe43c63c28e918f7c60acd7 /multimedia/ffmpeg/patches | |
| parent | 5f4b96ab57e4186e89d49198ec0e65155f1f4a77 (diff) | |
| download | pkgsrc-6530322f7a9416c1b0404cf856f6569492b23033.tar.gz | |
Patch support for img_resample() and friends back into ffmpeg even when
swscale is enabled. This allows older apps (such as vlc 0.8.6i) to run
without a specific ffmpeg package option and thus the swscale option is no
longer needed.
Diffstat (limited to 'multimedia/ffmpeg/patches')
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-imgconvert.c | 18 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-libavcodec_Makefile | 12 |
2 files changed, 30 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/patches/patch-imgconvert.c b/multimedia/ffmpeg/patches/patch-imgconvert.c new file mode 100644 index 00000000000..1995ccedbf8 --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-imgconvert.c @@ -0,0 +1,18 @@ +--- libavcodec/imgconvert.c.orig 2008-09-14 21:59:57.000000000 +0100 ++++ libavcodec/imgconvert.c 2008-09-14 22:00:56.000000000 +0100 +@@ -2108,7 +2108,6 @@ + } + #endif + +-#ifndef CONFIG_SWSCALE + static uint8_t y_ccir_to_jpeg[256]; + static uint8_t y_jpeg_to_ccir[256]; + static uint8_t c_ccir_to_jpeg[256]; +@@ -2628,7 +2627,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/patches/patch-libavcodec_Makefile b/multimedia/ffmpeg/patches/patch-libavcodec_Makefile new file mode 100644 index 00000000000..ec1dd3fbfca --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-libavcodec_Makefile @@ -0,0 +1,12 @@ +--- libavcodec/Makefile.orig 2008-09-14 21:58:12.000000000 +0100 ++++ libavcodec/Makefile 2008-09-14 21:58:36.000000000 +0100 +@@ -373,9 +373,7 @@ + + OBJS-$(HAVE_XVMC) += xvmcvideo.o + +-ifndef CONFIG_SWSCALE + OBJS += imgresample.o +-endif + + # processor-specific code + ifdef HAVE_MMX |