vorbis bld msgs, ffmpeg one frame/frame flush bug, ffmpeg audio history fixes

[goodguy/history.git] / cinelerra-5.0 / cinelerra / file.C

diff --git a/cinelerra-5.0/cinelerra/file.C b/cinelerra-5.0/cinelerra/file.C
index 294c6c6c52bc6f89f55c049ed840c0711135d145..17e555aa11e8e6221c93afda84d10e0effba9125 100644 (file)
--- a/cinelerra-5.0/cinelerra/file.C
+++ b/cinelerra-5.0/cinelerra/file.C
@@ -79,8 +79,11 @@
 #include "stringfile.h"
 #include "vframe.h"
 
-
-
+//suppress noref warning
+void *vorbis0_ov_callbacks[] = {
+ &OV_CALLBACKS_DEFAULT, &OV_CALLBACKS_NOCLOSE,
+ &OV_CALLBACKS_STREAMONLY, &OV_CALLBACKS_STREAMONLY_NOCLOSE,
+};
 
 File::File()
 {
@@ -808,7 +811,7 @@ int File::open_file(Preferences *preferences,
        if( rd ) {
 // one frame image file, no specific length
                if( !this->asset->audio_data && this->asset->video_data &&
-                   this->asset->video_length == 1 )
+                   this->asset->video_length <= 1 )
                        this->asset->video_length = -1;
        }