rework intl strategy, titler upgrades, fonts fixes, igor ru.po

[goodguy/history.git] / cinelerra-5.1 / cinelerra / filejpeg.C

diff --git a/cinelerra-5.1/cinelerra/filejpeg.C b/cinelerra-5.1/cinelerra/filejpeg.C
index ae8ee6ec7012a04b09f47623a08b899173fd0dc6..1eac64c74d5e5ee6402fb8b32939183bd1a0c7f0 100644 (file)
--- a/cinelerra-5.1/cinelerra/filejpeg.C
+++ b/cinelerra-5.1/cinelerra/filejpeg.C
@@ -127,16 +127,9 @@ int FileJPEG::get_best_colormodel(Asset *asset, int driver)
                case PLAYBACK_X11_GL:
                        return BC_YUV888;
                        break;
-               case PLAYBACK_LML:
-               case PLAYBACK_BUZ:
-                       return BC_YUV422P;
-                       break;
-               case VIDEO4LINUX:
                case VIDEO4LINUX2:
                        return BC_YUV420P;
                        break;
-               case CAPTURE_BUZ:
-               case CAPTURE_LML:
                case VIDEO4LINUX2JPEG:
                        return BC_YUV422;
                        break;
@@ -229,7 +222,7 @@ int FileJPEG::read_frame_header(char *path)
        asset->width = jpeg_decompress.image_width;
        asset->height = jpeg_decompress.image_height;
 
-       asset->interlace_mode = BC_ILACE_MODE_NOTINTERLACED;
+       asset->interlace_mode = ILACE_MODE_NOTINTERLACED;
 
        jpeg_destroy((j_common_ptr)&jpeg_decompress);
        fclose(stream);
@@ -304,7 +297,7 @@ JPEGUnit::~JPEGUnit()
 
 
 JPEGConfigVideo::JPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset)
- : BC_Window(PROGRAM_NAME ": Video Compression",
+ : BC_Window(_(PROGRAM_NAME ": Video Compression"),
        parent_window->get_abs_cursor_x(1),
        parent_window->get_abs_cursor_y(1),
        400,