diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 15:42:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 15:51:55 +0200 |
| commit | d5ec1ddf7bb0beb65319c749afc8fba2798a8ee1 (patch) | |
| tree | 773623f7aadf7b6f365b5024092c44489ed0affd /ffmpeg_filter.c | |
| parent | 22ffa5390f6b4bb99fc6cd1fb0f629f6c3a9ba8d (diff) | |
| parent | 9580818c5d934bde65a95efd2cee61c174721092 (diff) | |
| download | ffmpeg-d5ec1ddf7bb0beb65319c749afc8fba2798a8ee1.tar.gz | |
Merge commit '9580818c5d934bde65a95efd2cee61c174721092'
* commit '9580818c5d934bde65a95efd2cee61c174721092':
avconv: rename OutputStream.opts to OutputStream.encoder_opts
Conflicts:
ffmpeg.c
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 6b97e847e9..6fd170baea 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -99,7 +99,7 @@ void choose_sample_fmt(AVStream *st, AVCodec *codec) static char *choose_pix_fmts(OutputStream *ost) { - AVDictionaryEntry *strict_dict = av_dict_get(ost->opts, "strict", NULL, 0); + AVDictionaryEntry *strict_dict = av_dict_get(ost->encoder_opts, "strict", NULL, 0); if (strict_dict) // used by choose_pixel_fmt() and below av_opt_set(ost->st->codec, "strict", strict_dict->value, 0); @@ -874,7 +874,7 @@ int configure_filtergraph(FilterGraph *fg) args[strlen(args) - 1] = '\0'; fg->graph->resample_lavr_opts = av_strdup(args); - e = av_dict_get(ost->opts, "threads", NULL, 0); + e = av_dict_get(ost->encoder_opts, "threads", NULL, 0); if (e) av_opt_set(fg->graph, "threads", e->value, 0); } |