[SCM] libav/experimental: Add missing check on the existence of avcodec_opts[AVMEDIA_TYPE_X], fix crash in ffprobe.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 819e2ab0d8d65cee0e95c89c0a4eb77aa8237c75
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Mon Nov 22 22:03:21 2010 +0000

    Add missing check on the existence of avcodec_opts[AVMEDIA_TYPE_X],
    fix crash in ffprobe.
    
    Originally committed as revision 25799 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/cmdutils.c b/cmdutils.c
index 681ed42..b2e6ee0 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -228,11 +228,11 @@ int opt_default(const char *opt, const char *arg){
     if(!o && sws_opts)
         ret = av_set_string3(sws_opts, opt, arg, 1, &o);
     if(!o){
-        if(opt[0] == 'a')
+        if (opt[0] == 'a' && avcodec_opts[AVMEDIA_TYPE_AUDIO])
             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o);
-        else if(opt[0] == 'v')
+        else if(opt[0] == 'v' && avcodec_opts[AVMEDIA_TYPE_VIDEO])
             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o);
-        else if(opt[0] == 's')
+        else if(opt[0] == 's' && avcodec_opts[AVMEDIA_TYPE_SUBTITLE])
             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o);
     }
     if (o && ret < 0) {

-- 
Libav/FFmpeg packaging