aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-08-05 13:00:12 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-21 16:25:24 -0400
commitfcf59764b99c7daa9b0876fe65d1393e6b759673 (patch)
tree4bde9eff09a9cc4905f59985df0c6e5c2a1bf139
parent4a31b52fca20d1fc0abe0d0f5489b9eec2760219 (diff)
[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>
-rw-r--r--drivers/media/platform/coda/coda-common.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 6760e346f969..4e85e387f905 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -426,15 +426,16 @@ static int coda_try_fmt_vid_out(struct file *file, void *priv,
426 struct v4l2_format *f) 426 struct v4l2_format *f)
427{ 427{
428 struct coda_ctx *ctx = fh_to_ctx(priv); 428 struct coda_ctx *ctx = fh_to_ctx(priv);
429 const struct coda_codec *codec; 429 const struct coda_codec *codec = NULL;
430 430
431 /* Determine codec by encoded format, returns NULL if raw or invalid */ 431 /* Determine codec by encoded format, returns NULL if raw or invalid */
432 codec = coda_find_codec(ctx->dev, f->fmt.pix.pixelformat, 432 if (ctx->inst_type == CODA_INST_DECODER) {
433 V4L2_PIX_FMT_YUV420); 433 codec = coda_find_codec(ctx->dev, f->fmt.pix.pixelformat,
434 if (!codec && ctx->inst_type == CODA_INST_DECODER) {
435 codec = coda_find_codec(ctx->dev, V4L2_PIX_FMT_H264,
436 V4L2_PIX_FMT_YUV420); 434 V4L2_PIX_FMT_YUV420);
437 if (!codec) 435 if (!codec)
436 codec = coda_find_codec(ctx->dev, V4L2_PIX_FMT_H264,
437 V4L2_PIX_FMT_YUV420);
438 if (!codec)
438 return -EINVAL; 439 return -EINVAL;
439 } 440 }
440 441