[FFmpeg-devel] [PATCH 3/5] Add missing check on the existence of avcodec_opts[AVMEDIA_TYPE_X], fix crash.

Stefano Sabatini stefano.sabatini-lala
Thu Nov 18 21:36:56 CET 2010


---
 cmdutils.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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) {
-- 
1.7.1




More information about the ffmpeg-devel mailing list