[FFmpeg-cvslog] make it possible to compile ffmpeg without swscale

Paul B Mahol git at videolan.org
Mon Oct 21 15:57:35 CEST 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Oct  8 14:48:52 2013 +0000| [c65521693914aed1c9fe42a2d6aebbde667fac79] | committer: Paul B Mahol

make it possible to compile ffmpeg without swscale

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c65521693914aed1c9fe42a2d6aebbde667fac79
---

 configure    |    2 +-
 ffmpeg_opt.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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);
     }



More information about the ffmpeg-cvslog mailing list