OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
47b71ee
)
Do not use AVFMT_FLAG_NONBLOCK for the output file.
author
Nicolas George
<nicolas.george@normalesup.org>
Sat, 16 Jul 2011 08:09:17 +0000
(10:09 +0200)
committer
Nicolas George
<nicolas.george@normalesup.org>
Tue, 19 Jul 2011 08:12:33 +0000
(10:12 +0200)
Restore the commit
0de8ebf
by Carl Eugen Hoyos that was lost during the
merge
58257ea
.
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
662b5e5
..
fb72a3a
100644
(file)
--- 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;