diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-04 14:00:06 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-04 14:00:06 +0000 |
| commit | be4876eae9588006f3586ef4fa2a4dd18ea9e847 (patch) | |
| tree | bb3b26cff496405a75240821c160e56ac0631c02 | |
| parent | 14fa75eab4e410858476cdcac8a1ec8b27f8a221 (diff) | |
| download | ffmpeg-be4876eae9588006f3586ef4fa2a4dd18ea9e847.tar.gz | |
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
| -rw-r--r-- | cmdutils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c index 7903e27114..1e7211aa0d 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) |