From be4876eae9588006f3586ef4fa2a4dd18ea9e847 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Tue, 4 Jan 2011 14:00:06 +0000
Subject: [PATCH] Disable initialization of the swscale sws_opts context in
cmdutils.c:init_opts(), in the case libswscale compilation is not enabled.
Fix ffprobe and ffserver compilation with --disable-swscale.
Originally committed as revision 26212 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
cmdutils.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/cmdutils.c b/cmdutils.c
index 7903e271140..1e7211aa0d0 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -63,7 +63,9 @@ void init_opts(void)
for (i = 0; i < AVMEDIA_TYPE_NB; i++)
avcodec_opts[i] = avcodec_alloc_context2(i);
avformat_opts = avformat_alloc_context();
+#if CONFIG_SWSCALE
sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC, NULL, NULL, NULL);
+#endif
}
void uninit_opts(void)
@@ -73,7 +75,9 @@ void uninit_opts(void)
av_freep(&avcodec_opts[i]);
av_freep(&avformat_opts->key);
av_freep(&avformat_opts);
+#if CONFIG_SWSCALE
av_freep(&sws_opts);
+#endif
}
void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)
--
GitLab