p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] coda: skip calling coda_find_codec in encoder try_fmt_vid_out 

We know that it will return NULL in this case, so we can just as well
skip it altogether.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Philipp Zabel 2014-08-05 14:00:12 -03:00 committed by Mauro Carvalho Chehab
parent 4a31b52fca
commit fcf59764b9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/platform/coda/coda-common.c
View File

@ -426,14 +426,15 @@ static int coda_try_fmt_vid_out(struct file *file, void *priv,
struct v4l2_format *f)
{
struct coda_ctx *ctx = fh_to_ctx(priv);
const struct coda_codec *codec;
const struct coda_codec *codec = NULL;
/* Determine codec by encoded format, returns NULL if raw or invalid */
codec = coda_find_codec(ctx->dev, f->fmt.pix.pixelformat,
V4L2_PIX_FMT_YUV420);
if (!codec && ctx->inst_type == CODA_INST_DECODER) {
codec = coda_find_codec(ctx->dev, V4L2_PIX_FMT_H264,
if (ctx->inst_type == CODA_INST_DECODER) {
codec = coda_find_codec(ctx->dev, f->fmt.pix.pixelformat,
V4L2_PIX_FMT_YUV420);
if (!codec)
codec = coda_find_codec(ctx->dev, V4L2_PIX_FMT_H264,
V4L2_PIX_FMT_YUV420);
if (!codec)
return -EINVAL;
}