summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-05-23 09:59:35 +0200
committerAnton Khirnov <anton@khirnov.net>2016-05-30 17:08:55 +0200
commit532f095f662e0e06ee0125446720d6eb84c47abe (patch)
tree2f7c9977c2b7bc58937e1286072512c1ce724c8a
parent8b5eb15bd68f96f45cf1b47a27a420ef90393c47 (diff)
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 b3d3d561be..f36c125aa4 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;