projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clip fixes, ladspa build fixes
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
fileffmpeg.C
diff --git
a/cinelerra-5.1/cinelerra/fileffmpeg.C
b/cinelerra-5.1/cinelerra/fileffmpeg.C
index d4f89e6c47795c4fef2feab4f7b6efb46ae25d3d..33f3fa478d4a13d0f2449601a90aa9c950ad0e4b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/
cinelerra-5.1/cinelerra/fileffmpeg.C
@@
-210,7
+210,6
@@
int FileFFMPEG::select_video_stream(Asset *asset, int vstream)
if( !ff || !asset->video_data ) return 1;
asset->width = ff->ff_video_width(vstream);
asset->height = ff->ff_video_height(vstream);
if( !ff || !asset->video_data ) return 1;
asset->width = ff->ff_video_width(vstream);
asset->height = ff->ff_video_height(vstream);
- asset->video_length = ff->ff_video_frames(vstream);
if( (asset->video_length = ff->ff_video_frames(vstream)) < 2 )
asset->video_length = asset->video_length < 0 ? 0 : -1;
asset->frame_rate = ff->ff_frame_rate(vstream);
if( (asset->video_length = ff->ff_video_frames(vstream)) < 2 )
asset->video_length = asset->video_length < 0 ? 0 : -1;
asset->frame_rate = ff->ff_frame_rate(vstream);
@@
-1064,6
+1063,9
@@
void FFOptions::initialize(FFOptionsWindow *win, int kind)
if( dupl ) continue;
FFOptions_Opt *fopt = new FFOptions_Opt(this, opt, opt->name);
append(fopt);
if( dupl ) continue;
FFOptions_Opt *fopt = new FFOptions_Opt(this, opt, opt->name);
append(fopt);
+ AVDictionaryEntry *elem = av_dict_get(win->dialog->ff_opts,
+ opt->name, 0, AV_DICT_IGNORE_SUFFIX);
+ if( elem && elem->value ) fopt->set(elem->value);
char val[BCTEXTLEN], *vp = fopt->get(val, sizeof(val));
fopt->item_value->update(vp);
}
char val[BCTEXTLEN], *vp = fopt->get(val, sizeof(val));
fopt->item_value->update(vp);
}