projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit ffmpeg team - security fix for ffmpeg 5.1
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
formatpopup.C
diff --git
a/cinelerra-5.1/cinelerra/formatpopup.C
b/cinelerra-5.1/cinelerra/formatpopup.C
index 66f1e72f8b713d8291f926db9192055b7b347b0b..90f6599ad2310b084fdcdc78fdc1c208e8fca302 100644
(file)
--- a/
cinelerra-5.1/cinelerra/formatpopup.C
+++ b/
cinelerra-5.1/cinelerra/formatpopup.C
@@
-28,7
+28,7
@@
FormatPopup::FormatPopup(int x, int y, int do_audio, int do_video, int use_brender)
FormatPopup::FormatPopup(int x, int y, int do_audio, int do_video, int use_brender)
- : BC_ListBox(x, y,
200, 200
, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
+ : BC_ListBox(x, y,
xS(200), yS(200)
, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
{
this->do_audio = do_audio;
this->do_video = do_video;
{
this->do_audio = do_audio;
this->do_video = do_video;
@@
-59,7
+59,12
@@
void FormatPopup::create_objects()
post_item(FILE_JPEG);
post_item(FILE_JPEG_LIST);
post_item(FILE_JPEG);
post_item(FILE_JPEG_LIST);
+
if(!use_brender) {
if(!use_brender) {
+#ifdef HAVE_GIFLIB
+ post_item(FILE_GIF);
+ post_item(FILE_GIF_LIST);
+#endif
#ifdef HAVE_OPENEXR
post_item(FILE_EXR);
post_item(FILE_EXR_LIST);
#ifdef HAVE_OPENEXR
post_item(FILE_EXR);
post_item(FILE_EXR_LIST);
@@
-69,6
+74,10
@@
void FormatPopup::create_objects()
#ifdef HAVE_LIBZMPEG
post_item(FILE_AMPEG);
post_item(FILE_VMPEG);
#ifdef HAVE_LIBZMPEG
post_item(FILE_AMPEG);
post_item(FILE_VMPEG);
+#endif
+#ifdef HAVE_OGG
+ post_item(FILE_VORBIS);
+ post_item(FILE_OGG);
#endif
post_item(FILE_PCM);
}
#endif
post_item(FILE_PCM);
}
@@
-85,7
+94,10
@@
void FormatPopup::create_objects()
if(!use_brender)
post_item(FILE_TIFF);
post_item(FILE_TIFF_LIST);
if(!use_brender)
post_item(FILE_TIFF);
post_item(FILE_TIFF_LIST);
-
+#ifdef HAVE_OPENEXR
+ if(use_brender)
+ post_item(FILE_EXR_LIST);
+#endif
update(&format_items, 0, 0, 1);
}
update(&format_items, 0, 0, 1);
}
@@
-101,7
+113,7
@@
int FormatPopup::handle_event()
FFMPEGPopup::FFMPEGPopup(int x, int y)
FFMPEGPopup::FFMPEGPopup(int x, int y)
- : BC_ListBox(x, y,
100, 200
, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
+ : BC_ListBox(x, y,
xS(100), yS(200)
, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
{
set_tooltip(_("Set ffmpeg file type"));
}
{
set_tooltip(_("Set ffmpeg file type"));
}