summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--v4l2-apps/libv4l/libv4lconvert/Makefile2
-rw-r--r--v4l2-apps/libv4l/libv4lconvert/ov511-decomp.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/v4l2-apps/libv4l/libv4lconvert/Makefile b/v4l2-apps/libv4l/libv4lconvert/Makefile
index d723d54a0..036649e86 100644
--- a/v4l2-apps/libv4l/libv4lconvert/Makefile
+++ b/v4l2-apps/libv4l/libv4lconvert/Makefile
@@ -33,7 +33,7 @@ ifeq ($(LIBDIR),)
LIBDIR = $(PREFIX)/lib
endif
-override CPPFLAGS += -DLIBDIR=\"$(LIBDIR)/\"
+override CPPFLAGS += -DLIBDIR=\"$(LIBDIR)\"
all: $(TARGETS)
diff --git a/v4l2-apps/libv4l/libv4lconvert/ov511-decomp.c b/v4l2-apps/libv4l/libv4lconvert/ov511-decomp.c
index a5d7ff9d1..11ed2a601 100644
--- a/v4l2-apps/libv4l/libv4lconvert/ov511-decomp.c
+++ b/v4l2-apps/libv4l/libv4lconvert/ov511-decomp.c
@@ -603,9 +603,10 @@ static int v4lconvert_ov511_to_yuv420(unsigned char *src, unsigned char *dest,
src_size -= 11; /* Remove footer */
+ remove0blocks(src, &src_size);
+
/* Compressed ? */
if (src[8] & 0x40) {
- remove0blocks(src, &src_size);
rc = Decompress420HiNoMMX(src + 9, dest, w, h, src_size);
} else {
yuv420raw_to_yuv420p(src + 9, dest, w, h);