highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'

Browse Source 
* commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905':
  hqx: Merge invalid format check within switch block

Conflicts:
	libavcodec/hqx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-20 04:29:58 +02:00
commit 73e6af9d7b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/hqx.c
View File

@ -607,8 +607,7 @@ static int hqx_decode_frame(AVCodecContext *avctx, void *data,
avctx->pix_fmt = AV_PIX_FMT_YUVA444P16; avctx->pix_fmt = AV_PIX_FMT_YUVA444P16;
arg_data.decode_func = hqx_decode_444a; arg_data.decode_func = hqx_decode_444a;
break; break;
} default:
if (!arg_data.decode_func) {
av_log(avctx, AV_LOG_ERROR, "Invalid format: %d.\n", ctx->format); av_log(avctx, AV_LOG_ERROR, "Invalid format: %d.\n", ctx->format);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }