[FFmpeg-cvslog] avconv: Apply codec options to streams that are copied as well

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Feb 27 23:22:39 2013 +0200| [df0229a7caa124dcfb84c34b48d316744c467311] | committer: Martin Storsjö

avconv: Apply codec options to streams that are copied as well

This allows setting/overriding e.g. the bitrate parameter, which
is required for the smoothstreaming muxer. Normally, the bitrate
is set by the demuxer in these cases, but not all demuxers can
provide it. This allows stream copy of data to the smoothstreaming
muxer from such inputs.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df0229a7caa124dcfb84c34b48d316744c467311
---

 avconv.c     |    2 ++
 avconv_opt.c |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/avconv.c b/avconv.c
index 4ad01c2..75a8f0d 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1766,6 +1766,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/avconv_opt.c b/avconv_opt.c
index 2a40087..7c58f49 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -800,6 +800,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);