[SCM] libav/master: avconv: fix parsing the AVOptions for -target

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e2a89f7f0f8fe1c769c83d33efa717cc7b2edc57
Author: Anton Khirnov <anton at khirnov.net>
Date:   Tue Aug 26 06:26:35 2014 +0000

    avconv: fix parsing the AVOptions for -target
    
    CC: libav-stable at libav.org
    (cherry picked from commit f5245a9c6206878b892adf3ccbccc9311c202af5)
    Signed-off-by: Anton Khirnov <anton at khirnov.net>

diff --git a/avconv_opt.c b/avconv_opt.c
index 33ac290..2d06912 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1870,6 +1870,10 @@ static int opt_target(void *optctx, const char *opt, const char *arg)
         av_log(NULL, AV_LOG_ERROR, "Unknown target: %s\n", arg);
         return AVERROR(EINVAL);
     }
+
+    av_dict_copy(&o->g->codec_opts,  codec_opts, 0);
+    av_dict_copy(&o->g->format_opts, format_opts, 0);
+
     return 0;
 }
 

-- 
Libav/FFmpeg packaging