aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-03-06 14:09:35 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-03-06 14:09:35 +0000
commitda033b05ab2f3c9dd0274243df88bd8363de6c24 (patch)
tree30704ee39cdfd153023757e955dd0406380f1f20
parent6ce98ea4aee5a3c21d5068e3cc4f0f42abba7d2e (diff)
downloadffmpeg-da033b05ab2f3c9dd0274243df88bd8363de6c24.tar.gz
Make opt_default() look for options in sws_opts only if sws_opts is
defined, fix crash. Originally committed as revision 22232 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--cmdutils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c
index 90c165e42e..f1edc685ed 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -200,7 +200,7 @@ int opt_default(const char *opt, const char *arg){
}
if(!o)
ret = av_set_string3(avformat_opts, opt, arg, 1, &o);
- if(!o)
+ if(!o && sws_opts)
ret = av_set_string3(sws_opts, opt, arg, 1, &o);
if(!o){
if(opt[0] == 'a')