summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-11-28 16:35:50 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-11-28 23:13:45 +0100
commit04702a0d3d73836a3df1a5f61112b02f52c8dd8e (patch)
tree653740f7998bb69ac36f2f840ad3cc208fc6d02d /ffserver.c
parent3adb825650965492f5f874c027b426c0077b523d (diff)
downloadffmpeg-04702a0d3d73836a3df1a5f61112b02f52c8dd8e.tar.gz
ffserver: add some error handling to main()
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c
index bbf408bbc5..42e1f7d0c7 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4679,6 +4679,7 @@ static const OptionDef options[] = {
int main(int argc, char **argv)
{
struct sigaction sigact = { { 0 } };
+ int ret = 0;
config_filename = av_strdup("/etc/ffserver.conf");
@@ -4700,8 +4701,9 @@ int main(int argc, char **argv)
sigact.sa_flags = SA_NOCLDSTOP | SA_RESTART;
sigaction(SIGCHLD, &sigact, 0);
- if (parse_ffconfig(config_filename) < 0) {
- fprintf(stderr, "Incorrect config file - exiting.\n");
+ if ((ret = parse_ffconfig(config_filename)) < 0) {
+ fprintf(stderr, "Error reading configuration file '%s': %s\n",
+ config_filename, av_err2str(ret));
exit(1);
}
av_freep(&config_filename);