X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=33f3fa478d4a13d0f2449601a90aa9c950ad0e4b;hb=673257cc109af5234e4219a6baef9589b83b9359;hp=d4f89e6c47795c4fef2feab4f7b6efb46ae25d3d;hpb=c66c09b32c6f46ef67550a6c63ba7f9d1d46628d;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index d4f89e6c..33f3fa47 100644
--- 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);
-	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);
@@ -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);
+			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);
 		}