projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
7684a36
)
avserver: do not use a static string as a default for a string option
author
Anton Khirnov
<anton@khirnov.net>
Sun, 4 Aug 2013 16:47:22 +0000
(18:47 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Sun, 4 Aug 2013 16:47:22 +0000
(18:47 +0200)
Fixes an invalid free.
Bug-id: 448
avserver.c
patch
|
blob
|
history
diff --git
a/avserver.c
b/avserver.c
index
560eda1
..
56bcda9
100644
(file)
--- a/
avserver.c
+++ b/
avserver.c
@@
-301,7
+301,7
@@
static int rtp_new_av_stream(HTTPContext *c,
static const char *my_program_name;
-static const char *config_filename
= "/etc/avserver.conf"
;
+static const char *config_filename;
static int avserver_debug;
static int no_launch;
@@
-4633,6
+4633,8
@@
int main(int argc, char **argv)
{
struct sigaction sigact = { { 0 } };
+ config_filename = av_strdup("/etc/avserver.conf");
+
parse_loglevel(argc, argv, options);
av_register_all();
avformat_network_init();