RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 09:12:33 +00:00
Code Issues Projects Releases Wiki Activity

ffserver: prefer av_asprintf over malloc+snprintf for Launch setting.

Browse Source
This commit is contained in:
Clément Bœsch 2012-11-14 10:36:23 +02:00 committed by Clément Bœsch
parent 66ff90f4a3
commit a9ba9268d7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffserver.c
View File

@ -4208,10 +4208,7 @@ static int parse_ffconfig(const char *filename)
feed->child_argv[i] = av_strdup(arg); feed->child_argv[i] = av_strdup(arg);
} }
feed->child_argv[i] = av_malloc(30 + strlen(feed->filename)); feed->child_argv[i] = av_asprintf("http://%s:%d/%s",
snprintf(feed->child_argv[i], 30+strlen(feed->filename),
"http://%s:%d/%s",
(my_http_addr.sin_addr.s_addr == INADDR_ANY) ? "127.0.0.1" : (my_http_addr.sin_addr.s_addr == INADDR_ANY) ? "127.0.0.1" :
inet_ntoa(my_http_addr.sin_addr), inet_ntoa(my_http_addr.sin_addr),
ntohs(my_http_addr.sin_port), feed->filename); ntohs(my_http_addr.sin_port), feed->filename);