projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mhi-net-immutable' of https://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
drivers
/
staging
/
media
/
hantro
/
hantro_v4l2.c
diff --git
a/drivers/staging/media/hantro/hantro_v4l2.c
b/drivers/staging/media/hantro/hantro_v4l2.c
index
b668a82
..
f5fbdbc
100644
(file)
--- a/
drivers/staging/media/hantro/hantro_v4l2.c
+++ b/
drivers/staging/media/hantro/hantro_v4l2.c
@@
-367,7
+367,7
@@
hantro_reset_raw_fmt(struct hantro_ctx *ctx)
hantro_reset_fmt(raw_fmt, raw_vpu_fmt);
raw_fmt->width = encoded_fmt->width;
- raw_fmt->
width = encoded_fmt->width
;
+ raw_fmt->
height = encoded_fmt->height
;
if (ctx->is_encoder)
hantro_set_fmt_out(ctx, raw_fmt);
else