[PATCH] Disable initialization of the swscale sws_opts context in cmdutils.c:init_opts(), in the case libswscale compilation is not enabled.

[Stefano Sabatini]

Fix ffprobe and ffserver compilation with --disable-swscale.
---
 cmdutils.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index a48d0c3..f8f5b68 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)
-- 
1.7.2.3


--yrj/dFKFPuw6o+aM--