X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Ffileffmpeg.C;h=90c1a6ef62071f3fb52bb5d96131f729949f2962;hb=5aad2133f228b736f033d6c48e1629078b858286;hp=280ed9d72107d85ca3344effb7c519cc4b5733f6;hpb=94e8dc2b306135e7735b2618a54f0f7de7ac7a0c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/fileffmpeg.C b/cinelerra-5.0/cinelerra/fileffmpeg.C
index 280ed9d7..90c1a6ef 100644
--- a/cinelerra-5.0/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.0/cinelerra/fileffmpeg.C
@@ -132,7 +132,7 @@ int FileFFMPEG::check_sig(Asset *asset)
 	return ret;
 }
 
-void FileFFMPEG::get_info(char *path, char *text)
+void FileFFMPEG::get_info(char *path, char *text, int len)
 {
 	char *cp = text;
 	FFMPEG ffmpeg(0);
@@ -150,7 +150,7 @@ void FileFFMPEG::get_info(char *path, char *text)
 	if( !ret ) ret = ffmpeg.open_decoder();
 	if( !ret ) {
 		cp += sprintf(cp, _("info:\n"));
-		ffmpeg.info(cp, BCTEXTLEN-(cp-text));
+		ffmpeg.info(cp, len-(cp-text));
 	}
 	else
 		sprintf(cp, _("== open failed\n"));
@@ -187,7 +187,6 @@ int FileFFMPEG::select_video_stream(Asset *asset, int vstream)
 int FileFFMPEG::select_audio_stream(Asset *asset, int astream)
 {
 	if( !ff || !asset->audio_data ) return 1;
-	asset->channels = ff->ff_audio_channels(astream);
 	asset->sample_rate = ff->ff_sample_rate(astream);
        	asset->audio_length = ff->ff_audio_samples(astream);
 	return 0;
@@ -319,7 +318,6 @@ int FileFFMPEG::get_best_colormodel(Asset *asset, int driver)
 }
 
 //======
-extern void get_exe_path(char *result); // from main.C
 
 FFMPEGConfigAudio::FFMPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Audio Preset"),