summaryrefslogtreecommitdiff
path: root/v4l2-apps/libv4l
diff options
context:
space:
mode:
authorhans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain>2009-06-14 22:51:13 +0200
committerhans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain>2009-06-14 22:51:13 +0200
commitb0d33e19d6aa45f2c7504810f971d1b607faf88c (patch)
tree2d483f2aeb8b0911c1df86537e72d5e0c328ab6f /v4l2-apps/libv4l
parent4dc7af7e5508c90e1117c8cc909ec1b7acb1979a (diff)
downloadmediapointer-dvb-s2-b0d33e19d6aa45f2c7504810f971d1b607faf88c.tar.gz
mediapointer-dvb-s2-b0d33e19d6aa45f2c7504810f971d1b607faf88c.tar.bz2
libv4l: Remove 0 blocks from non-compresses ov511 frames too
From: Hans de Goede <hdegoede@redhat.com> libv4l: Remove 0 blocks from non-compresses ov511 frames too Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'v4l2-apps/libv4l')
-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);