diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-01-10 09:13:32 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-01-10 16:47:15 +0100 |
commit | 7b9373db89096dea65a206bb4637db61348776f2 (patch) | |
tree | 821ed39a76bfeae894371538f4b042ba3146f181 /avconv.c | |
parent | 5c7c9a9f3354164c793baf7796c8ed432a184b0c (diff) | |
download | ffmpeg-7b9373db89096dea65a206bb4637db61348776f2.tar.gz |
avconv: fix -copyinkf.
This option only applies to streamcopy, but is currently processed only
when encoding.
Diffstat (limited to 'avconv.c')
-rw-r--r-- | avconv.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3618,13 +3618,13 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) ost->top_field_first = -1; MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st); - MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st); - #if CONFIG_AVFILTER MATCH_PER_STREAM_OPT(filters, str, filters, oc, st); if (filters) ost->avfilter = av_strdup(filters); #endif + } else { + MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st); } return ost; |