projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove old quicktime, replaced with current ffmpeg
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
bitspopup.h
diff --git
a/cinelerra-5.0/cinelerra/bitspopup.h
b/cinelerra-5.0/cinelerra/bitspopup.h
index 7733a561d6f71afcd16bcc201151b27846349e5f..7c6999fac0536ff94f82e97ea31f9e994a607350 100644
(file)
--- a/
cinelerra-5.0/cinelerra/bitspopup.h
+++ b/
cinelerra-5.0/cinelerra/bitspopup.h
@@
-34,7
+34,6
@@
public:
int x,
int y,
int *output,
int x,
int y,
int *output,
- int use_ima4,
int use_ulaw,
int use_adpcm,
int use_float,
int use_ulaw,
int use_adpcm,
int use_float,
@@
-48,7
+47,7
@@
public:
BitsPopupMenu *menu;
ArrayList<BC_ListBoxItem*> bits_items;
BitsPopupText *textbox;
BitsPopupMenu *menu;
ArrayList<BC_ListBoxItem*> bits_items;
BitsPopupText *textbox;
- int x, y, use_
ima4, use_
ulaw, use_float, use_adpcm, *output;
+ int x, y, use_ulaw, use_float, use_adpcm, *output;
int use_32linear;
int use_8linear;
BC_WindowBase *parent_window;
int use_32linear;
int use_8linear;
BC_WindowBase *parent_window;