diff mbox

[FFmpeg-devel] make swresample optional for ffmpeg

Message ID 20180412201902.24517-1-onemda@gmail.com
State Accepted
Commit 0b360cae1cb790fe34e681a6a674990d48d415d9
Headers show

Commit Message

Paul B Mahol April 12, 2018, 8:19 p.m. UTC 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 configure            | 2 +-
 fftools/ffmpeg_opt.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Paul B Mahol April 16, 2018, 9:17 a.m. UTC | #1 
On 4/12/18, Paul B Mahol <onemda@gmail.com> wrote:
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
>  configure            | 2 +-
>  fftools/ffmpeg_opt.c | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
>

ping
Paul B Mahol April 25, 2018, 8:18 a.m. UTC | #2 
On 4/16/18, Paul B Mahol <onemda@gmail.com> wrote:
> On 4/12/18, Paul B Mahol <onemda@gmail.com> wrote:
>> Signed-off-by: Paul B Mahol <onemda@gmail.com>
>> ---
>>  configure            | 2 +-
>>  fftools/ffmpeg_opt.c | 2 ++
>>  2 files changed, 3 insertions(+), 1 deletion(-)
>>
>
> ping
>

Will apply.
diff mbox

Patch

diff --git a/configure b/configure
index 1e192f8780..a0c05c043d 100755
--- a/configure
+++ b/configure
@@ -3458,7 +3458,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);
     }