projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct last chkin dvd opts files
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
formattools.C
diff --git
a/cinelerra-5.1/cinelerra/formattools.C
b/cinelerra-5.1/cinelerra/formattools.C
index 9199fff077e01c185665c8c23b9aa4d35709a0a5..2bf178ab8927d3b670e61defb7a502df38dade41 100644
(file)
--- a/
cinelerra-5.1/cinelerra/formattools.C
+++ b/
cinelerra-5.1/cinelerra/formattools.C
@@
-386,8
+386,9
@@
void FormatTools::update_extension()
if(need_extension)
{
char *ptr1 = ptr;
if(need_extension)
{
char *ptr1 = ptr;
- extension_ptr = asset->format != FILE_FFMPEG ?
- extensions.get(0) : asset->fformat;
+// change "qt" to "mov" since ffmpeg does not know qt
+ extension_ptr = asset->format != FILE_FFMPEG ? extensions.get(0) :
+ !strcmp(asset->fformat, "qt") ? "mov" : asset->fformat ;
while(*extension_ptr != 0 && *extension_ptr != '/')
*ptr1++ = *extension_ptr++;
*ptr1 = 0;
while(*extension_ptr != 0 && *extension_ptr != '/')
*ptr1++ = *extension_ptr++;
*ptr1 = 0;
@@
-770,7
+771,7
@@
int FormatFFMPEG::handle_event()
{
BC_ListBoxItem *selection = get_selection(0, 0);
if( selection ) {
{
BC_ListBoxItem *selection = get_selection(0, 0);
if( selection ) {
- char *text = get_selection(0, 0)->get_text();
+ c
onst c
har *text = get_selection(0, 0)->get_text();
format->ffmpeg_type->update(text);
format->asset->ff_audio_options[0] = 0;
format->asset->ff_video_options[0] = 0;
format->ffmpeg_type->update(text);
format->asset->ff_audio_options[0] = 0;
format->asset->ff_video_options[0] = 0;