aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2011-07-16 10:09:17 +0200
committerNicolas George <nicolas.george@normalesup.org>2011-07-19 10:12:33 +0200
commit257f274dfa000ae0add4aef8bd11375c8d32add0 (patch)
tree6017f1f3179b87e485813cd803db03f1ca3cdc39
parent47b71eea099b3fe2c7e16644878ad9b7067974e3 (diff)
downloadffmpeg-257f274dfa000ae0add4aef8bd11375c8d32add0.tar.gz
Do not use AVFMT_FLAG_NONBLOCK for the output file.
Restore the commit 0de8ebf by Carl Eugen Hoyos that was lost during the merge 58257ea.
-rw-r--r--ffmpeg.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 662b5e52c5..fb72a3a5d1 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3976,7 +3976,6 @@ static int opt_output_file(const char *opt, const char *filename)
av_log(NULL, AV_LOG_WARNING, "-loop_output is deprecated, use -loop\n");
oc->loop_output = loop_output;
}
- oc->flags |= AVFMT_FLAG_NONBLOCK;
frame_rate = (AVRational){0, 0};
frame_width = 0;