fixes for xft when gc func not copy, fixes for zmpeg timestamp processing

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

diff --git a/cinelerra-5.1/cinelerra/fileogg.C b/cinelerra-5.1/cinelerra/fileogg.C
index 8f1a9d3df6898e3d413ec7b19b8449bd18b566e6..747fa399948617866f79ee3daecd96a825f075b5 100644 (file)
--- a/cinelerra-5.1/cinelerra/fileogg.C
+++ b/cinelerra-5.1/cinelerra/fileogg.C
@@ -1472,6 +1472,7 @@ int FileOGG::read_frame(VFrame *frame)
                        ogg_stream_pagein(&tf->to, &og);
                }
                ogg_stream_packetout(&tf->to, &op);
+               if( theora_packet_isheader(&op) ) continue;
 //printf("frame %jd, key %d\n", ogg_frame_position, theora_packet_iskeyframe(&op));
                if (expect_keyframe && !theora_packet_iskeyframe(&op))
                {
@@ -1534,8 +1535,6 @@ int FileOGG::read_frame(VFrame *frame)
                        frame->get_w());
                delete temp_frame;
        }
-       else if( !ogg_frame_position )
-               frame->clear_frame();
 
        next_frame_position ++;