X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvdevicex11.C;fp=cinelerra-5.1%2Fcinelerra%2Fvdevicex11.C;h=a92986c1e6c7d695c74b67c2ad36dbab76d551a2;hb=296147f865b3572c7e2ecdb47a5d827956221188;hp=c0ca4b08357df010a1d85b04532b38ede2ece028;hpb=d84cde299ca545b6c5db1998a151884984213b0f;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/vdevicex11.C b/cinelerra-5.1/cinelerra/vdevicex11.C index c0ca4b08..a92986c1 100644 --- a/cinelerra-5.1/cinelerra/vdevicex11.C +++ b/cinelerra-5.1/cinelerra/vdevicex11.C @@ -236,11 +236,11 @@ int VDeviceX11::get_display_colormodel(int file_colormodel) if( device->out_config->driver == PLAYBACK_X11_GL ) { if( file_colormodel == BC_RGB888 || - file_colormodel == BC_RGBA8888 || - file_colormodel == BC_YUV888 || - file_colormodel == BC_YUVA8888 || - file_colormodel == BC_RGB_FLOAT || - file_colormodel == BC_RGBA_FLOAT ) { + file_colormodel == BC_RGBA8888 || + file_colormodel == BC_YUV888 || + file_colormodel == BC_YUVA8888 || + file_colormodel == BC_RGB_FLOAT || + file_colormodel == BC_RGBA_FLOAT ) { return file_colormodel; } @@ -257,13 +257,6 @@ int VDeviceX11::get_display_colormodel(int file_colormodel) } } -// 2 more colormodels are supported by OpenGL - if( device->out_config->driver == PLAYBACK_X11_GL ) { - if( file_colormodel == BC_RGB_FLOAT || - file_colormodel == BC_RGBA_FLOAT ) - result = file_colormodel; - } - if( result < 0 ) { switch( file_colormodel ) { case BC_RGB888: