aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-03-14 09:44:07 +0100
committerAnton Khirnov <anton@khirnov.net>2013-03-15 08:59:27 +0100
commit3e175a2a550f5c2f788e8cd969052e10a5025a27 (patch)
tree91a2698b4c8d8698b2dba42f7ebd9a38794bd57b
parentb066d90211072c7532e17c0c54d8475f10fc97ad (diff)
downloadffmpeg-3e175a2a550f5c2f788e8cd969052e10a5025a27.tar.gz
avconv: mark attachment streams as immediately finished
There are never any packets for those streams. Fixes an infinite loop with -attach.
-rw-r--r--avconv_opt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/avconv_opt.c b/avconv_opt.c
index 30fbadf07a..2c43da2bbd 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1096,6 +1096,7 @@ static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *o
{
OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT);
ost->stream_copy = 1;
+ ost->finished = 1;
return ost;
}