Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 11:55:23 +0000 (12:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 11:57:17 +0000 (12:57 +0100)
* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
  avconv: Apply codec options to streams that are copied as well

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

index f1e6834..448a9e2 100644 (file)
--- 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);
         }
     }
 
index fc5e1c8..22d6e41 100644 (file)
@@ -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);