summaryrefslogtreecommitdiff
authorPaul B Mahol <onemda@gmail.com>2013-10-08 14:48:52 (GMT)
committer Paul B Mahol <onemda@gmail.com>2013-10-21 13:57:00 (GMT)
commitc65521693914aed1c9fe42a2d6aebbde667fac79 (patch)
treead4392f914710bad3de75dfc1b1c166432845d7c
parentf5ed83c3831fcaca0f87cd67ca743946a54023d0 (diff)
downloadffmpeg-c65521693914aed1c9fe42a2d6aebbde667fac79.zip
ffmpeg-c65521693914aed1c9fe42a2d6aebbde667fac79.tar.gz
ffmpeg-c65521693914aed1c9fe42a2d6aebbde667fac79.tar.bz2
make it possible to compile ffmpeg without swscale
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat
-rwxr-xr-xconfigure2
-rw-r--r--ffmpeg_opt.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 0ea62aa..75d523d 100755
--- a/configure
+++ b/configure
@@ -2263,7 +2263,7 @@ postproc_deps="avutil gpl"
swscale_deps="avutil"
# programs
-ffmpeg_deps="avcodec avfilter avformat swscale swresample"
+ffmpeg_deps="avcodec avfilter avformat swresample"
ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
null_filter
setpts_filter trim_filter"
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 738d612..c9283d6 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2457,7 +2457,9 @@ void show_help_default(const char *opt, const char *arg)
int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM;
show_help_children(avcodec_get_class(), flags);
show_help_children(avformat_get_class(), flags);
+#if CONFIG_SWSCALE
show_help_children(sws_get_class(), flags);
+#endif
show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM);
show_help_children(avfilter_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM);
}