From f10d9996d25a224defdb2e474aef0b0a54438720 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2014 10:36:11 +0200 Subject: decoder/mad: simplify if/else chain --- src/decoder/plugins/MadDecoderPlugin.cxx | 38 +++++++++++++++----------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'src/decoder/plugins/MadDecoderPlugin.cxx') diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index cc5468221..2b82b6221 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -432,17 +432,16 @@ MadDecoder::DecodeNextFrameHeader(Tag **tag) return DECODE_CONT; } } - if (MAD_RECOVERABLE(stream.error)) { + + if (MAD_RECOVERABLE(stream.error)) return DECODE_SKIP; - } else { - if (stream.error == MAD_ERROR_BUFLEN) - return DECODE_CONT; - else { - FormatWarning(mad_domain, - "unrecoverable frame level error: %s", - mad_stream_errorstr(&stream)); - return DECODE_BREAK; - } + else if (stream.error == MAD_ERROR_BUFLEN) + return DECODE_CONT; + else { + FormatWarning(mad_domain, + "unrecoverable frame level error: %s", + mad_stream_errorstr(&stream)); + return DECODE_BREAK; } } @@ -479,17 +478,16 @@ MadDecoder::DecodeNextFrame() return DECODE_CONT; } } - if (MAD_RECOVERABLE(stream.error)) { + + if (MAD_RECOVERABLE(stream.error)) return DECODE_SKIP; - } else { - if (stream.error == MAD_ERROR_BUFLEN) - return DECODE_CONT; - else { - FormatWarning(mad_domain, - "unrecoverable frame level error: %s", - mad_stream_errorstr(&stream)); - return DECODE_BREAK; - } + else if (stream.error == MAD_ERROR_BUFLEN) + return DECODE_CONT; + else { + FormatWarning(mad_domain, + "unrecoverable frame level error: %s", + mad_stream_errorstr(&stream)); + return DECODE_BREAK; } } -- cgit v1.2.3