projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
colorpicker fixups
[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 2a162836ce4564c76c3c8b77a9834b5cebf5f5c0..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_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 VIDEO4LINUX2:
return BC_YUV420P;
break;
- case CAPTURE_BUZ:
- case CAPTURE_LML:
case VIDEO4LINUX2JPEG:
return BC_YUV422;
break;
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->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);
jpeg_destroy((j_common_ptr)&jpeg_decompress);
fclose(stream);