diff --git a/libquicktime-jpeg7.patch b/libquicktime-jpeg7.patch
new file mode 100644
index 0000000..cc694cc
--- /dev/null
+++ b/libquicktime-jpeg7.patch
@@ -0,0 +1,34 @@
+Index: plugins/mjpeg/libmjpeg.c
+===================================================================
+--- plugins/mjpeg/libmjpeg.c.orig
++++ plugins/mjpeg/libmjpeg.c
+@@ -479,6 +479,9 @@ static void new_jpeg_objects(mjpeg_compr
+   /* Ideally the error handler would be set here but it must be called in a thread */
+   jpeg_create_decompress(&(engine->jpeg_decompress));
+   engine->jpeg_decompress.raw_data_out = TRUE;
++#if JPEG_LIB_VERSION >= 70
++  engine->jpeg_decompress.do_fancy_upsampling = FALSE;
++#endif
+   engine->jpeg_decompress.dct_method = JDCT_IFAST;
+   }
+ 
+@@ -665,6 +668,9 @@ static void decompress_field(mjpeg_compr
+   
+   // Reset by jpeg_read_header
+   engine->jpeg_decompress.raw_data_out = TRUE;
++#if JPEG_LIB_VERSION >= 70
++  engine->jpeg_decompress.do_fancy_upsampling = FALSE;
++#endif
+   jpeg_start_decompress(&engine->jpeg_decompress);
+ 
+   // Generate colormodel from jpeg sampling
+@@ -786,6 +792,9 @@ static mjpeg_compressor* mjpeg_new_compr
+   result->jpeg_compress.in_color_space = JCS_RGB;
+   jpeg_set_quality(&(result->jpeg_compress), mjpeg->quality, 0);
+ 
++#if JPEG_LIB_VERSION >= 70
++  result->jpeg_compress.do_fancy_downsampling = FALSE;
++#endif
+   if(mjpeg->use_float) 
+     result->jpeg_compress.dct_method = JDCT_FLOAT;
+   else
diff --git a/libquicktime.changes b/libquicktime.changes
index b076d54..fae0a7a 100644
--- a/libquicktime.changes
+++ b/libquicktime.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov  3 16:29:57 UTC 2010 - puzel@novell.com
+
+- add libquicktime-jpeg7.patch (bnc#647859)
+  - patch by Martin Wilck
+
 -------------------------------------------------------------------
 Fri Feb 26 11:40:10 UTC 2010 - puzel@novell.com
 
diff --git a/libquicktime.spec b/libquicktime.spec
index 5ae0d6d..f9aeb73 100644
--- a/libquicktime.spec
+++ b/libquicktime.spec
@@ -38,6 +38,7 @@ Release:        1
 Url:            http://libquicktime.sf.net
 Source0:        %{name}-%{version}.tar.bz2
 Patch1:         %{name}-1.0.3-dont_disable_deprecated.patch
+Patch2:         libquicktime-jpeg7.patch	
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A Library for Reading and Writing Quicktime Movie Files
 Provides:       quicktime4linux
@@ -69,6 +70,7 @@ from quicktime4linux
 # fix brokem links in API docs
 sed -r 's/"(building|codecs|index|license|opening|positioning|reading|util|writing).html/"qt4l_&/' -i `find doc -type f`
 %patch1 -p1
+%patch2 -p0	
 
 %build
 autoreconf -f -i -v