hqx: Merge invalid format check within switch block

17aa81d9 · Vittorio Giovara · 6a85dfc8 · 17aa81d9
Commit 17aa81d9 authored Apr 09, 2015 by Vittorio Giovara
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

hqx.c libavcodec/hqx.c +1 -2

No files found.
--- a/libavcodec/hqx.c
+++ b/libavcodec/hqx.c
@@ -573,8 +573,7 @@ static int hqx_decode_frame(AVCodecContext *avctx, void *data,
        avctx->pix_fmt = AV_PIX_FMT_YUVA444P16;
        decode_func = hqx_decode_444a;
        break;
-    }
+    default:
-    if (!decode_func) {
        av_log(avctx, AV_LOG_ERROR, "Invalid format: %d.\n", ctx->format);
        return AVERROR_INVALIDDATA;
    }