diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:30:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:41:31 +0100 |
| commit | 6db37c9468051ff34cac58fa428bc5d86fc1ee45 (patch) | |
| tree | ac578a2ae106cb9a15f37769a87f5d4cf1dd3405 /ffmpeg_opt.c | |
| parent | 71cf094e1be086bce4c535b1fe0d96a0449486ae (diff) | |
| parent | 5c7db097ebe1fb5c233cedd8846615074e7d6044 (diff) | |
| download | ffmpeg-6db37c9468051ff34cac58fa428bc5d86fc1ee45.tar.gz | |
Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'
* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
avconv: pass libavresample options to AVFilterGraph
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
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 bba9dba5de..c4b886bf0e 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1008,6 +1008,8 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e if (ost->enc && av_get_exact_bits_per_sample(ost->enc->id) == 24) ost->swr_dither_scale = ost->swr_dither_scale*256; + av_dict_copy(&ost->resample_opts, o->g->resample_opts, 0); + ost->source_index = source_index; if (source_index >= 0) { ost->sync_ist = input_streams[source_index]; |