more changes for ffmpeg options dialog

[goodguy/history.git] / cinelerra-5.1 / cinelerra / ffmpeg.C

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 25cfbe70fc6f89dba9877d0d8d4405816dd4f0c7..bfd2364a6ab1cfb047895fe8878c9ca91fe4c717 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -1161,11 +1161,17 @@ int FFMPEG::get_codec(char *codec, const char *path, const char *spec)
        if( !fp ) return 1;
        int ret = 0;
        if( !fgets(line, sizeof(line), fp) ) ret = 1;
+       fclose(fp);
        if( !ret ) {
                line[sizeof(line)-1] = 0;
                ret = scan_option_line(line, format, codec);
        }
-       fclose(fp);
+       if( !ret ) {
+               char *vp = codec, *ep = vp+BCTEXTLEN-1;
+               while( vp < ep && *vp && *vp != '|' ) ++vp;
+               if( *vp == '|' ) --vp;
+               while( vp > codec && (*vp==' ' || *vp=='\t') ) *vp-- = 0;
+       }
        return ret;
 }