[SCM] libav/experimental: Add missing existence checks in opt_default().

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d860aaf8cd1ff566f4587643bf3cd7cf713f4c32
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Fri Sep 24 16:32:08 2010 +0000

    Add missing existence checks in opt_default().
    
    Originally committed as revision 25179 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/cmdutils.c b/cmdutils.c
index 382c6c1..4a643ae 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -198,12 +198,12 @@ int opt_default(const char *opt, const char *arg){
     const AVOption *o= NULL;
     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]);
         if(o2)
             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);
     if(!o && sws_opts)
         ret = av_set_string3(sws_opts, opt, arg, 1, &o);

-- 
Libav/FFmpeg packaging