virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Disable initialization of the swscale sws_opts context in

Browse Source 
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
This commit is contained in:
Stefano Sabatini
2011-01-04 14:00:06 +00:00
parent 14fa75eab4
commit be4876eae9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmdutils.c
View File

@@ -63,7 +63,9 @@ void init_opts(void)
for (i = 0; i < AVMEDIA_TYPE_NB; i++) for (i = 0; i < AVMEDIA_TYPE_NB; i++)
avcodec_opts[i] = avcodec_alloc_context2(i); avcodec_opts[i] = avcodec_alloc_context2(i);
avformat_opts = avformat_alloc_context(); avformat_opts = avformat_alloc_context();
#if CONFIG_SWSCALE
sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC, NULL, NULL, NULL); sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC, NULL, NULL, NULL);
#endif
} }
void uninit_opts(void) void uninit_opts(void)
@@ -73,7 +75,9 @@ void uninit_opts(void)
av_freep(&avcodec_opts[i]); av_freep(&avcodec_opts[i]);
av_freep(&avformat_opts->key); av_freep(&avformat_opts->key);
av_freep(&avformat_opts); av_freep(&avformat_opts);
#if CONFIG_SWSCALE
av_freep(&sws_opts); av_freep(&sws_opts);
#endif
} }
void log_callback_help(void* ptr, int level, const char* fmt, va_list vl) void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)