From 17aa81d94781c6f62dc7d1dbd1f8891c020c9905 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Thu, 9 Apr 2015 18:09:31 +0200
Subject: [PATCH] hqx: Merge invalid format check within switch block

---
 libavcodec/hqx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c
index 3de3dc2e62..a231afcda7 100644
--- 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;
-    }
-    if (!decode_func) {
+    default:
         av_log(avctx, AV_LOG_ERROR, "Invalid format: %d.\n", ctx->format);
         return AVERROR_INVALIDDATA;
     }