summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-04-09 18:09:31 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-04-19 12:41:59 +0100
commit17aa81d94781c6f62dc7d1dbd1f8891c020c9905 (patch)
tree86bf21edfa783647416e78b52a8ac677a225c096
parent6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 (diff)
downloadffmpeg-streaming-17aa81d94781c6f62dc7d1dbd1f8891c020c9905.zip
ffmpeg-streaming-17aa81d94781c6f62dc7d1dbd1f8891c020c9905.tar.gz
hqx: Merge invalid format check within switch block
-rw-r--r--libavcodec/hqx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/hqx.c b/libavcodec/hqx.c
index 3de3dc2..a231afc 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;
}
OpenPOWER on IntegriCloud