Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtmpproto: Reorder conditions to help dead code elimination

Browse Source 
This makes sure that these branches are eliminated properly
with clang with optimizations disabled.
pull/45/head
Vittorio Giovara 11 years ago
parent 3ea5f64fff
commit d763978583
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libavformat/rtmpproto.c

12
libavformat/rtmpproto.c
Unescape View File

@ -1171,7 +1171,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
for (i = 9; i <= RTMP_HANDSHAKE_PACKET_SIZE; i++) for (i = 9; i <= RTMP_HANDSHAKE_PACKET_SIZE; i++)
tosend[i] = av_lfg_get(&rnd) >> 24; tosend[i] = av_lfg_get(&rnd) >> 24;
if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) { if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
/* When the client wants to use RTMPE, we have to change the command /* When the client wants to use RTMPE, we have to change the command
* byte to 0x06 which means to use encrypted data and we have to set * byte to 0x06 which means to use encrypted data and we have to set
* the flash version to at least 9.0.115.0. */ * the flash version to at least 9.0.115.0. */
@ -1249,7 +1249,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) { if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
/* Compute the shared secret key sent by the server and initialize /* Compute the shared secret key sent by the server and initialize
* the RC4 encryption. */ * the RC4 encryption. */
if ((ret = ff_rtmpe_compute_secret_key(rt->stream, serverdata + 1, if ((ret = ff_rtmpe_compute_secret_key(rt->stream, serverdata + 1,
@ -1279,7 +1279,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) { if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
/* Encrypt the signature to be send to the server. */ /* Encrypt the signature to be send to the server. */
ff_rtmpe_encrypt_sig(rt->stream, tosend + ff_rtmpe_encrypt_sig(rt->stream, tosend +
RTMP_HANDSHAKE_PACKET_SIZE - 32, digest, RTMP_HANDSHAKE_PACKET_SIZE - 32, digest,
@ -1291,13 +1291,13 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
RTMP_HANDSHAKE_PACKET_SIZE)) < 0) RTMP_HANDSHAKE_PACKET_SIZE)) < 0)
return ret; return ret;
if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) { if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
/* Set RC4 keys for encryption and update the keystreams. */ /* Set RC4 keys for encryption and update the keystreams. */
if ((ret = ff_rtmpe_update_keystream(rt->stream)) < 0) if ((ret = ff_rtmpe_update_keystream(rt->stream)) < 0)
return ret; return ret;
} }
} else { } else {
if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) { if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
/* Compute the shared secret key sent by the server and initialize /* Compute the shared secret key sent by the server and initialize
* the RC4 encryption. */ * the RC4 encryption. */
if ((ret = ff_rtmpe_compute_secret_key(rt->stream, serverdata + 1, if ((ret = ff_rtmpe_compute_secret_key(rt->stream, serverdata + 1,
@ -1315,7 +1315,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
RTMP_HANDSHAKE_PACKET_SIZE)) < 0) RTMP_HANDSHAKE_PACKET_SIZE)) < 0)
return ret; return ret;
if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) { if (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted) {
/* Set RC4 keys for encryption and update the keystreams. */ /* Set RC4 keys for encryption and update the keystreams. */
if ((ret = ff_rtmpe_update_keystream(rt->stream)) < 0) if ((ret = ff_rtmpe_update_keystream(rt->stream)) < 0)
return ret; return ret;

Write Preview
Loading…
Cancel
Save