highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-02-24 17:30:52 +01:00
parent 71cf094e1b 5c7db097eb
commit 6db37c9468
6 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg_opt.c
View File

@@ -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];