On Tue, Jul 24, 2012 at 5:57 AM, Samuel Pitoiset <g...@libav.org> wrote:
> Module: libav
> Branch: master
> Commit: f7bfb126cde36e15048273a0e346fe2ebdc27f57
>
> Author: Samuel Pitoiset <samuel.pitoi...@gmail.com>
> Committer: Martin Storsjö <mar...@martin.st>
> Date: Tue Jul 24 13:46:28 2012 +0200
>
> rtmp: Move the CONFIG_ condition into the if conditions
>
> This makes sure these calls are removed by dead code elimination
> even if optimization is disabled. This fixes building without
> crypto libraries without optimization.
>
> Signed-off-by: Martin Storsjö <mar...@martin.st>
>
> ---
>
> libavformat/rtmpproto.c | 15 +++++++--------
> 1 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
> index f7ba7d5..1d25ae9 100644
> --- a/libavformat/rtmpproto.c
> +++ b/libavformat/rtmpproto.c
> @@ -729,7 +728,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
> for (i = 9; i <= RTMP_HANDSHAKE_PACKET_SIZE; i++)
> tosend[i] = av_lfg_get(&rnd) >> 24;
>
> - if (encrypted) {
> + if (rt->encrypted && CONFIG_FFRTMPCRYPT_PROTOCOL) {
FWIW to get this to DCE with clang/asan 3.1
CONFIG_FFRTMPCRYPT_PROTOCOL has to come first. But that seems pretty
broken, so I'm going to migrate my asan config to O1 with some stuff
turned off as is the current asan recommendation.
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
