2 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index f1e683488e..448a9e2b56 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2424,6 +2424,8 @@ static int transcode_init(void)
 
             if (ost->st->codec->me_threshold)
                 input_streams[ost->source_index]->st->codec->debug |= FF_DEBUG_MV;
+        } else {
+            av_opt_set_dict(ost->st->codec, &ost->opts);
         }
     }
 
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index fc5e1c86a5..22d6e4126f 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -957,6 +957,8 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
                    preset, ost->file_index, ost->index);
             exit(1);
         }
+    } else {
+        ost->opts = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st, NULL);
     }
 
     avcodec_get_context_defaults3(st->codec, ost->enc);