Messages in this thread | | | Date | Thu, 5 Sep 2013 12:02:29 -0700 | Subject | Re: [GIT PULL for v3.12-rc1] media updates | From | Linus Torvalds <> |
| |
On Thu, Sep 5, 2013 at 7:24 AM, Mauro Carvalho Chehab <m.chehab@samsung.com> wrote: > > Also, a trivial conflict at s5p_mfc_dec.c and s5p_mfc_enc.c will happen as > a macro name got renamed from IS_MFCV6 to IS_MFCV6_PLUS.
I did an "ugly merge" when fixing that conflict up, because the stupid code at the conflict site did this:
if (!IS_MFCV6_PLUS(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) { mfc_err("Not supported format.\n"); return -EINVAL; } if (!IS_MFCV6_PLUS(dev)) { if (fmt->fourcc == V4L2_PIX_FMT_VP8) { mfc_err("Not supported format.\n"); return -EINVAL; } }
and there was no way I was going to fix up the code and not remove the idiotic duplication of the exact same test.
I have no idea why that code was duplicated with slightly different syntax, but my OCD couldn't let it remain when I was editing those lines.
Linus
| |