aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-05-23 09:59:35 +0200
committerAnton Khirnov <anton@khirnov.net>2016-06-21 12:39:02 +0200
commit5e1840622ce6e41c57d9c407604863d3f3dcc3ae (patch)
tree47c14301a84d35c3f68ce517365f38beee6c3f33
parent73c6ec6d659bab11ac424a4ba6ce3a56246295ee (diff)
downloadffmpeg-5e1840622ce6e41c57d9c407604863d3f3dcc3ae.tar.gz
avconv: fix handling attachments in init_output_stream
The current code assumes that encoding_needed is simply an inverse of stream_copy, which is not true for manually attached files (for which neither of those is true).
-rw-r--r--avconv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/avconv.c b/avconv.c
index e5a76b1746..4f8d688895 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1734,7 +1734,7 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len)
}
ost->st->time_base = ost->enc_ctx->time_base;
- } else {
+ } else if (ost->stream_copy) {
ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts);
if (ret < 0)
return ret;