diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 23:56:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 23:56:26 +0200 |
| commit | d40c0e4a6733ade9aaafc687bcaccc0cba1183b4 (patch) | |
| tree | 04d0fd666f006a73d5d6f44ef40e0a0f1264b979 /ffserver.c | |
| parent | 0e78e575ed47eb8e405cf81e3f487b56af7ce90a (diff) | |
| download | ffmpeg-d40c0e4a6733ade9aaafc687bcaccc0cba1183b4.tar.gz | |
ffserver: fix order of evaluation bugs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ffserver.c b/ffserver.c index f8649027b9..82d328878c 100644 --- a/ffserver.c +++ b/ffserver.c @@ -560,9 +560,11 @@ static void start_multicast(void) default_port = 6000; for(stream = first_stream; stream != NULL; stream = stream->next) { if (stream->is_multicast) { + unsigned random0 = av_lfg_get(&random_state); + unsigned random1 = av_lfg_get(&random_state); /* open the RTP connection */ 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 */ if (stream->multicast_port == 0) { @@ -3092,9 +3094,12 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url, found: /* 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", - av_lfg_get(&random_state), av_lfg_get(&random_state)); + random0, random1); + } /* find rtp session, and create it if none found */ rtp_c = find_rtp_session(h->session_id); |