X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=82a810d61794dad65817b130262023ed5d40ea91;hp=4d797431eeb9e57151d13c6afca9469a7cae19eb;hb=af44bff549c39ac8bb6e42a791e7a211e1013526;hpb=88d056e4f1b0a9fd692bbfb34262dd05359c4d9c

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 4d797431..82a810d6 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -342,9 +342,9 @@ int FileFFMPEG::get_best_colormodel(int driver, int vstream)
 	int is_mpeg = !ff ? 0 : ff->ff_video_mpeg_color_range(vstream);
 
 	switch(driver) {
-	case PLAYBACK_X11: return is_mpeg ? BC_YUV888 : BC_RGB888;
+	case PLAYBACK_X11:
+	case PLAYBACK_X11_GL: return is_mpeg ? BC_YUV888 : BC_RGB888;
 	case PLAYBACK_X11_XV: return BC_YUV420P;
-	case PLAYBACK_X11_GL: return BC_RGB_FLOAT;
 	}
 
 	return BC_RGB888;
@@ -354,9 +354,9 @@ int FileFFMPEG::get_best_colormodel(Asset *asset, int driver)
 {
 	switch(driver) {
 // the direct X11 color model requires scaling in the codec
-	case PLAYBACK_X11: return BC_RGB888;
+	case PLAYBACK_X11:
+	case PLAYBACK_X11_GL: return BC_RGB888;
 	case PLAYBACK_X11_XV: return BC_YUV420P;
-	case PLAYBACK_X11_GL: return BC_RGB_FLOAT;
 	}
 
 	return BC_YUV420P;