diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 12:55:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 12:57:17 +0100 |
| commit | 41401773d3c2f745605a2a306968b281fdec34bd (patch) | |
| tree | f0bc1d3c9a58d1d3b5e3c37b8e847d70e8b1bdd8 /ffmpeg_opt.c | |
| parent | 46f4b468e2102467aadf5b91e44b8a0607202ee2 (diff) | |
| parent | df0229a7caa124dcfb84c34b48d316744c467311 (diff) | |
| download | ffmpeg-41401773d3c2f745605a2a306968b281fdec34bd.tar.gz | |
Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'
* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
avconv: Apply codec options to streams that are copied as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |