Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'

* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
  avconv: Apply codec options to streams that are copied as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 2 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);
         }
     }