summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg/options.mk
diff options
context:
space:
mode:
authorsborrill <sborrill@pkgsrc.org>2008-09-15 21:24:00 +0000
committersborrill <sborrill@pkgsrc.org>2008-09-15 21:24:00 +0000
commite49bf2187604ea4b7946cd5f9bdf606fbc0f57f2 (patch)
tree2f888e69efacead0ffe43c63c28e918f7c60acd7 /multimedia/ffmpeg/options.mk
parent10e553a6cdfbf55754a372a956cdddb0cb06ebf2 (diff)
downloadpkgsrc-e49bf2187604ea4b7946cd5f9bdf606fbc0f57f2.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/options.mk')
-rw-r--r--multimedia/ffmpeg/options.mk15
1 files changed, 3 insertions, 12 deletions
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index 0a1a2ea8714..7e43b98cfc9 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.10 2008/09/12 13:44:23 sborrill Exp $
+# $NetBSD: options.mk,v 1.11 2008/09/15 21:24:00 sborrill Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac swscale x264
-PKG_SUGGESTED_OPTIONS= faac theora xvid swscale x264
+PKG_SUPPORTED_OPTIONS= sdl theora xvid faad faac x264
+PKG_SUGGESTED_OPTIONS= faac theora xvid x264
#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
#PKG_OPTIONS_GROUP.aac-decoder= faad faac
@@ -47,15 +47,6 @@ CONFIGURE_ARGS+= --disable-ffplay
.endif
###
-### swscale option
-###
-
-.if !empty(PKG_OPTIONS:Mswscale)
-CONFIGURE_ARGS+= --enable-swscale
-PLIST.swscale= yes
-.endif
-
-###
### OGG Theora support
###