highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffserver: fix order of evaluation bugs

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-09-08 23:56:26 +02:00
parent 0e78e575ed
commit d40c0e4a67
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ffserver.c
View File

@ -560,9 +560,11 @@ static void start_multicast(void)
default_port = 6000; default_port = 6000;
for(stream = first_stream; stream != NULL; stream = stream->next) { for(stream = first_stream; stream != NULL; stream = stream->next) {
if (stream->is_multicast) { if (stream->is_multicast) {
unsigned random0 = av_lfg_get(&random_state);
unsigned random1 = av_lfg_get(&random_state);
/* open the RTP connection */ /* open the RTP connection */
snprintf(session_id, sizeof(session_id), "%08x%08x", snprintf(session_id, sizeof(session_id), "%08x%08x",
av_lfg_get(&random_state), av_lfg_get(&random_state)); random0, random1);
/* choose a port if none given */ /* choose a port if none given */
if (stream->multicast_port == 0) { if (stream->multicast_port == 0) {
@ -3092,9 +3094,12 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
found: found:
/* generate session id if needed */ /* generate session id if needed */
if (h->session_id[0] == '\0') if (h->session_id[0] == '\0') {
unsigned random0 = av_lfg_get(&random_state);
unsigned random1 = av_lfg_get(&random_state);
snprintf(h->session_id, sizeof(h->session_id), "%08x%08x", snprintf(h->session_id, sizeof(h->session_id), "%08x%08x",
av_lfg_get(&random_state), av_lfg_get(&random_state)); random0, random1);
}
/* find rtp session, and create it if none found */ /* find rtp session, and create it if none found */
rtp_c = find_rtp_session(h->session_id); rtp_c = find_rtp_session(h->session_id);