make swresample optional for ffmpeg
authorPaul B Mahol <onemda@gmail.com>
Thu, 12 Apr 2018 20:15:05 +0000 (22:15 +0200)
committerPaul B Mahol <onemda@gmail.com>
Wed, 25 Apr 2018 10:38:03 +0000 (12:38 +0200)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
configure
fftools/ffmpeg_opt.c

index dee507c..9fa1665 100755 (executable)
--- 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"
index d7a7eb0..8ae68ae 100644 (file)
@@ -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);
     }