X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Flibmjpeg.C;h=b16140235899e6cce5f382e5ced6b01c4a7507f7;hb=9f344ea7acc2f3e077a4f736e2f99eaeff81d66b;hp=14937dfbc7ff686159a2aabaacfb4a1037be4fce;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/libmjpeg.C b/cinelerra-5.1/cinelerra/libmjpeg.C
index 14937dfb..b1614023 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;
 
@@ -1528,29 +1527,6 @@ typedef struct
 	int unpadded_field_size;
 } avi_hdr_t;
 
-#define LML_MARKER_SIZE 0x2c
-#define LML_MARKER_TAG 0xffe3
-void insert_lml33_markers(unsigned char **buffer,
-	long *field2_offset,
-	long *buffer_size,
-	long *buffer_allocated)
-{
-	long marker_offset = -1;
-
-/* Search for existing marker to replace */
-//	marker_offset = find_marker(*buffer, *buffer_size, LML_MARKER_TAG);
-
-/* Insert new marker */
-	if(marker_offset < 0)
-	{
-		marker_offset = 2;
-		insert_space(buffer,
-			buffer_size,
-			buffer_allocated,
-			2,
-			LML_MARKER_SIZE);
-	}
-}
 
 static int qt_table_offsets(unsigned char *buffer,
 	long buffer_size,