diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 15:55:23 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 15:57:17 +0400 |
commit | 41401773d3c2f745605a2a306968b281fdec34bd (patch) | |
tree | f0bc1d3c9a58d1d3b5e3c37b8e847d70e8b1bdd8 /ffmpeg.c | |
parent | 46f4b468e2102467aadf5b91e44b8a0607202ee2 (diff) | |
parent | df0229a7caa124dcfb84c34b48d316744c467311 (diff) |
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.c')
-rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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); } } |