generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow building of command line utils without swresample lib

Browse Source 
This allows building ffprobe without swresample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Gavin Kinsey 2012-05-29 14:43:33 +00:00 committed by Michael Niedermayer
parent f5af8d5e76
commit bf6fb563b9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmdutils.c
View File

@ -69,7 +69,9 @@ void init_opts(void)
sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC,
NULL, NULL, NULL);
#endif
#if CONFIG_SWRESAMPLE
swr_opts = swr_alloc();
#endif
}
void uninit_opts(void)
@ -78,7 +80,9 @@ void uninit_opts(void)
sws_freeContext(sws_opts);
sws_opts = NULL;
#endif
#if CONFIG_SWRESAMPLE
swr_free(&swr_opts);
#endif
av_dict_free(&format_opts);
av_dict_free(&codec_opts);
}
@ -449,6 +453,7 @@ int opt_default(const char *opt, const char *arg)
}
}
#endif
#if CONFIG_SWRESAMPLE
swr_class = swr_get_class();
if (!oc && !of && !os && (oswr = av_opt_find(&swr_class, opt, NULL, 0,
AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) {
@ -458,6 +463,7 @@ int opt_default(const char *opt, const char *arg)
return ret;
}
}
#endif
if (oc || of || os || oswr)
return 0;