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

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit be4876eae9588006f3586ef4fa2a4dd18ea9e847
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Jan 4 14:00:06 2011 +0000

    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

diff --git a/cmdutils.c b/cmdutils.c
index 7903e27..1e7211a 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)

-- 
Libav/FFmpeg packaging