From b0d33e19d6aa45f2c7504810f971d1b607faf88c Mon Sep 17 00:00:00 2001 From: "hans@rhel5-devel.localdomain" Date: Sun, 14 Jun 2009 22:51:13 +0200 Subject: libv4l: Remove 0 blocks from non-compresses ov511 frames too From: Hans de Goede libv4l: Remove 0 blocks from non-compresses ov511 frames too Priority: normal Signed-off-by: Hans de Goede --- v4l2-apps/libv4l/libv4lconvert/Makefile | 2 +- v4l2-apps/libv4l/libv4lconvert/ov511-decomp.c | 3 ++- 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); -- cgit v1.2.3