X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Ffileffmpeg.C;fp=cinelerra-5.0%2Fcinelerra%2Ffileffmpeg.C;h=90c1a6ef62071f3fb52bb5d96131f729949f2962;hb=e3c81d537528ce9e4300d54fc5c89e20c21070a0;hp=6a8681d4fe01cc530a7fdb075abc519c48528d9a;hpb=0b311f8973ab36038f053abd2ae3ff2dd2347944;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/fileffmpeg.C b/cinelerra-5.0/cinelerra/fileffmpeg.C index 6a8681d4..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;