OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b133ec6
)
ffserver: improve error feedback in case of write_header() failure
author
Stefano Sabatini
<stefasab@gmail.com>
Fri, 29 Nov 2013 11:10:20 +0000
(12:10 +0100)
committer
Stefano Sabatini
<stefasab@gmail.com>
Fri, 29 Nov 2013 11:11:39 +0000
(12:11 +0100)
ffserver.c
patch
|
blob
|
history
diff --git
a/ffserver.c
b/ffserver.c
index
469046a
..
64b6be2
100644
(file)
--- a/
ffserver.c
+++ b/
ffserver.c
@@
-2321,9
+2321,10
@@
static int http_prepare_data(HTTPContext *c)
*/
c->fmt_ctx.max_delay = (int)(0.7*AV_TIME_BASE);
- if (avformat_write_header(&c->fmt_ctx, NULL) < 0) {
- http_log("Error writing output header\n");
- return -1;
+ if ((ret = avformat_write_header(&c->fmt_ctx, NULL)) < 0) {
+ http_log("Error writing output header for stream '%s': %s\n",
+ c->stream->filename, av_err2str(ret));
+ return ret;
}
av_dict_free(&c->fmt_ctx.metadata);