projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fix for In/Out pointer Attach Effect on empty track/location - Andrew+Anon
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
fileffmpeg.C
diff --git
a/cinelerra-5.1/cinelerra/fileffmpeg.C
b/cinelerra-5.1/cinelerra/fileffmpeg.C
index eed14f2005f6c8044a19c9bf3a0fbf577ffba192..bcc558170db4817a3976f0a248aaabfe7aaa3b05 100644
(file)
--- a/
cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/
cinelerra-5.1/cinelerra/fileffmpeg.C
@@
-343,10
+343,11
@@
int FileFFMPEG::open_file(int rd, int wr)
if( video_layers > 0 ) {
asset->video_data = 1;
asset->aspect_ratio = ff->ff_aspect_ratio(0);
if( video_layers > 0 ) {
asset->video_data = 1;
asset->aspect_ratio = ff->ff_aspect_ratio(0);
- printf("ff_aspect_ratio, %f \n", asset->aspect_ratio);
if (!asset->interlace_mode) asset->interlace_mode = ff->ff_interlace(0);
if (!asset->interlace_mode) asset->interlace_mode = ff->ff_interlace(0);
- ff->video_probe(1);
+ if ( ff->ff_video_frames(0) > 1 ) {
+// ff->video_probe(1);
if (!asset->interlace_mode && (ff->interlace_from_codec) ) asset->interlace_mode = ff->video_probe(1);
if (!asset->interlace_mode && (ff->interlace_from_codec) ) asset->interlace_mode = ff->video_probe(1);
+ }
if( !asset->layers ) asset->layers = video_layers;
asset->actual_width = ff->ff_video_width(0);
asset->actual_height = ff->ff_video_height(0);
if( !asset->layers ) asset->layers = video_layers;
asset->actual_width = ff->ff_video_width(0);
asset->actual_height = ff->ff_video_height(0);
@@
-515,6
+516,8
@@
FFMPEGConfigAudio::FFMPEGConfigAudio(BC_WindowBase *parent_window,
audio_options = 0;
format_name = asset->fformat;
codec_name = asset->acodec;
audio_options = 0;
format_name = asset->fformat;
codec_name = asset->acodec;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Options for Render with FFmpeg");
}
FFMPEGConfigAudio::~FFMPEGConfigAudio()
}
FFMPEGConfigAudio::~FFMPEGConfigAudio()
@@
-680,6
+683,8
@@
FFMPEGConfigVideo::FFMPEGConfigVideo(BC_WindowBase *parent_window,
bitrate = 0;
quality = 0;
video_options = 0;
bitrate = 0;
quality = 0;
video_options = 0;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Options for Render with FFmpeg");
}
FFMPEGConfigVideo::~FFMPEGConfigVideo()
}
FFMPEGConfigVideo::~FFMPEGConfigVideo()
@@
-846,6
+851,8
@@
FFMPEGConfigFormat::FFMPEGConfigFormat(FFOptionsFormatViewDialog *view_dialog,
format_options = 0;
format_name = asset->fformat;
codec_name = 0;
format_options = 0;
format_name = asset->fformat;
codec_name = 0;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Modifying FFmpeg Format Options");
}
FFMPEGConfigFormat::~FFMPEGConfigFormat()
}
FFMPEGConfigFormat::~FFMPEGConfigFormat()
@@
-1592,6
+1599,8
@@
FFOptionsWindow::FFOptionsWindow(FFOptionsDialog *dialog, int x, int y)
this->dialog = dialog;
this->selected = 0;
this->kind = 0;
this->dialog = dialog;
this->selected = 0;
this->kind = 0;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Modifying FFmpeg Format Options");
}
FFOptionsWindow::~FFOptionsWindow()
}
FFOptionsWindow::~FFOptionsWindow()
@@
-1943,9
+1952,9
@@
int FFOptionsFormatView::handle_event()
{
Asset *asset = fmt_config->asset;
char *format_name = asset->fformat;
{
Asset *asset = fmt_config->asset;
char *format_name = asset->fformat;
- char
*replace_name0
= "mov";
- char
*replace_name1
= "mpegts";
- char
*replace_name2
= "matroska";
+ char
replace_name0[]
= "mov";
+ char
replace_name1[]
= "mpegts";
+ char
replace_name2[]
= "matroska";
if (!strcmp(format_name, "qt"))
format_name = replace_name0; // fixup
if (!strcmp(format_name, "m2ts"))
if (!strcmp(format_name, "qt"))
format_name = replace_name0; // fixup
if (!strcmp(format_name, "m2ts"))