X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=f3f535681234e3bbefe1a17d841eae4443458c55;hb=2451d3174f3b64d3ce4e311b125813cf2881eca4;hp=99fa71193af683c2df5194f7f67911ccf2bfeea9;hpb=e5d1c3ec8b49e9e4cd31f30e991f52ab11de93b1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 99fa7119..f3f53568 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -338,33 +338,13 @@ int FileFFMPEG::colormodel_supported(int colormodel)
 int FileFFMPEG::get_best_colormodel(Asset *asset, int driver)
 {
 	switch(driver) {
-	case PLAYBACK_X11:
-		return BC_RGB888;
-	case PLAYBACK_X11_XV:
-	case PLAYBACK_ASYNCHRONOUS:
-		return BC_YUV888;
-	case PLAYBACK_X11_GL:
-		return BC_YUV888;
-	case PLAYBACK_DV1394:
-	case PLAYBACK_FIREWIRE:
-		return BC_YUV422P;
-	case VIDEO4LINUX2:
-		return BC_RGB888;
-	case VIDEO4LINUX2JPEG:
-		return BC_COMPRESSED;
-	case CAPTURE_DVB:
-	case VIDEO4LINUX2MPEG:
-		return BC_YUV422P;
-	case CAPTURE_JPEG_WEBCAM:
-		return BC_COMPRESSED;
-	case CAPTURE_YUYV_WEBCAM:
-		return BC_YUV422;
-	case CAPTURE_FIREWIRE:
-	case CAPTURE_IEC61883:
-		return BC_YUV422P;
+// the direct X11 color model requires scaling in the codec
+	case PLAYBACK_X11: return BC_BGR8888;
+//	case PLAYBACK_X11: return BC_RGB888;
+	case PLAYBACK_X11_GL: return BC_RGB888;
 	}
 
-	return BC_RGB888;
+	return BC_YUV420P;
 }
 
 int FileFFMPEG::can_render(const char *fformat, const char *type)