aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-07-28 16:47:38 +0200
committerAnton Khirnov <anton@khirnov.net>2011-08-12 18:35:12 +0200
commitd4863fc1a83ceab1d75469b406a2c67e5659b2a0 (patch)
tree6d8779fe01d8bda7e23473fc45da43467b072b1f /ffmpeg.c
parentf60d13663742d1c695680ede83c4d646bc57d380 (diff)
downloadffmpeg-d4863fc1a83ceab1d75469b406a2c67e5659b2a0.tar.gz
cmdutils: allow precisely specifying a stream for AVOptions.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 1a6ba51b42..079384b8a6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -683,7 +683,7 @@ static OutputStream *new_output_stream(AVFormatContext *oc, int file_idx, AVCode
ost->st = st;
ost->enc = codec;
if (codec)
- ost->opts = filter_codec_opts(codec_opts, codec->id, 1);
+ ost->opts = filter_codec_opts(codec_opts, codec->id, oc, st);
avcodec_get_context_defaults3(st->codec, codec);
@@ -3293,7 +3293,7 @@ static int opt_input_file(const char *opt, const char *filename)
ist->st = st;
ist->file_index = nb_input_files;
ist->discard = 1;
- ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, 0);
+ ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st);
if (i < nb_ts_scale)
ist->ts_scale = ts_scale[i];