1. ffmpeg
  2. Commit 41401773d3c2f745605a2a306968b281fdec34bd
Browse code

Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'

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

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

Michael Niedermayer authored on 2013/03/01 20:55:23
Showing 2 changed files
ffmpeg.c
History View file @ 4140177
... ... 
@@ -2424,6 +2424,8 @@ static int transcode_init(void)
2424 2424
2425 2425 
             if (ost->st->codec->me_threshold)
2426 2426 
                 input_streams[ost->source_index]->st->codec->debug |= FF_DEBUG_MV;
2427 
+        } else {
2428 
+            av_opt_set_dict(ost->st->codec, &ost->opts);
2427 2429 
         }
2428 2430 
     }
2429 2431
ffmpeg_opt.c
History View file @ 4140177
... ... 
@@ -957,6 +957,8 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
957 957 
                    preset, ost->file_index, ost->index);
958 958 
             exit(1);
959 959 
         }
960 
+    } else {
961 
+        ost->opts = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st, NULL);
960 962 
     }
961 963
962 964 
     avcodec_get_context_defaults3(st->codec, ost->enc);