[FFmpeg-cvslog] rtmpproto: fix compilation without optimizations
Michael Niedermayer
git at videolan.org
Tue Jul 24 00:37:19 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 24 00:11:14 2012 +0200| [dc31b84cbfb73b31211afaacfb8d340c14282a2e] | committer: Michael Niedermayer
rtmpproto: fix compilation without optimizations
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc31b84cbfb73b31211afaacfb8d340c14282a2e
---
libavformat/rtmpproto.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 22287c8..a85ed31 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -719,7 +719,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
int i;
int server_pos, client_pos;
uint8_t digest[32], signature[32];
- int encrypted = rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL;
+#define encrypted (CONFIG_FFRTMPCRYPT_PROTOCOL && rt->encrypted)
int ret, type = 0;
av_log(s, AV_LOG_DEBUG, "Handshaking...\n");
@@ -874,6 +874,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
return 0;
}
+#undef encrypted
/**
* Parse received packet and possibly perform some action depending on
More information about the ffmpeg-cvslog
mailing list