summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2018-04-12 22:15:05 +0200
committerPaul B Mahol <onemda@gmail.com>2018-04-25 12:38:03 +0200
commit0b360cae1cb790fe34e681a6a674990d48d415d9 (patch)
treecc0b8930ae00c95bf59456d15cb9dea7d2b174ad
parentd06b01fc2d4f5e031d45f9460d1eea610d23d6c5 (diff)
make swresample optional for ffmpeg
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rwxr-xr-xconfigure2
-rw-r--r--fftools/ffmpeg_opt.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index dee507cb6a..9fa1665496 100755
--- a/configure
+++ b/configure
@@ -3459,7 +3459,7 @@ avfilter_extralibs="pthreads_extralibs"
avutil_extralibs="d3d11va_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs"
# programs
-ffmpeg_deps="avcodec avfilter avformat swresample"
+ffmpeg_deps="avcodec avfilter avformat"
ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
null_filter
trim_filter"
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index d7a7eb0662..8ae68aec0e 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -3157,7 +3157,9 @@ void show_help_default(const char *opt, const char *arg)
#if CONFIG_SWSCALE
show_help_children(sws_get_class(), flags);
#endif
+#if CONFIG_SWRESAMPLE
show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM);
+#endif
show_help_children(avfilter_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM);
show_help_children(av_bsf_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_BSF_PARAM);
}