highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing existence checks in opt_default().

Browse Source 
Originally committed as revision 25179 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-09-24 16:32:08 +00:00
parent d7cd001ff2
commit d860aaf8cd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmdutils.c
View File

@ -198,12 +198,12 @@ int opt_default(const char *opt, const char *arg){
const AVOption *o= NULL; const AVOption *o= NULL;
int opt_types[]={AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_FLAG_AUDIO_PARAM, 0, AV_OPT_FLAG_SUBTITLE_PARAM, 0}; int opt_types[]={AV_OPT_FLAG_VIDEO_PARAM, AV_OPT_FLAG_AUDIO_PARAM, 0, AV_OPT_FLAG_SUBTITLE_PARAM, 0};
for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){ for(type=0; *avcodec_opts && type<AVMEDIA_TYPE_NB && ret>= 0; type++){
const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]); const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
if(o2) if(o2)
ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o); ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o);
} }
if(!o) if(!o && avformat_opts)
ret = av_set_string3(avformat_opts, opt, arg, 1, &o); ret = av_set_string3(avformat_opts, opt, arg, 1, &o);
if(!o && sws_opts) if(!o && sws_opts)
ret = av_set_string3(sws_opts, opt, arg, 1, &o); ret = av_set_string3(sws_opts, opt, arg, 1, &o);