X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Flibmjpeg.C;h=7cf2159ca1d69a4c6dce666b6f834d9ab73adb91;hb=e13e0a987ad66b8274fcbaddc71eac583ea80bea;hp=14937dfbc7ff686159a2aabaacfb4a1037be4fce;hpb=bc2cf75c1c7a338d0491f1341bb3fc10f86e2ecf;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/libmjpeg.C b/cinelerra-5.1/cinelerra/libmjpeg.C
index 14937dfb..7cf2159c 100644
--- a/cinelerra-5.1/cinelerra/libmjpeg.C
+++ b/cinelerra-5.1/cinelerra/libmjpeg.C
@@ -771,13 +771,12 @@ printf("decompress_field %d\n", __LINE__);
 	jpeg_start_decompress(&engine->jpeg_decompress);
 
 // Generate colormodel from jpeg sampling
-	if(engine->jpeg_decompress.comp_info[0].v_samp_factor == 2 &&
-		engine->jpeg_decompress.comp_info[0].h_samp_factor == 2)
-    	mjpeg->jpeg_color_model = BC_YUV420P;
-    else
-	if(engine->jpeg_decompress.comp_info[0].v_samp_factor == 1 &&
-		engine->jpeg_decompress.comp_info[0].h_samp_factor == 2)
-    	mjpeg->jpeg_color_model = BC_YUV422P;
+	if( engine->jpeg_decompress.comp_info[0].v_samp_factor == 2 &&
+	    engine->jpeg_decompress.comp_info[0].h_samp_factor == 2)
+		mjpeg->jpeg_color_model = BC_YUV420P;
+	else if(engine->jpeg_decompress.comp_info[0].v_samp_factor == 1 &&
+	    engine->jpeg_decompress.comp_info[0].h_samp_factor == 2)
+		mjpeg->jpeg_color_model = BC_YUV422P;
 	else
 		mjpeg->jpeg_color_model = BC_YUV444P;