]> git.sesse.net Git - ffmpeg/commitdiff
avconv: do not set encoder options when streamcopy is used
authorAnton Khirnov <anton@khirnov.net>
Mon, 23 May 2016 07:29:01 +0000 (09:29 +0200)
committerAnton Khirnov <anton@khirnov.net>
Tue, 21 Jun 2016 10:39:02 +0000 (12:39 +0200)
avconv.c

index 6470837d59b1230e50555aed83d641a73b438ee9..d7365f3d26a147eba8e00cbfe5608638d4068286 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -1735,10 +1735,6 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len)
 
         ost->st->time_base = ost->enc_ctx->time_base;
     } else if (ost->stream_copy) {
-        ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts);
-        if (ret < 0)
-            return ret;
-
         /*
          * FIXME: will the codec context used by the parser during streamcopy
          * This should go away with the new parser API.