From 58b1637bd8c3a7cc49a56e76e2e64a92b7cbd4d5 Mon Sep 17 00:00:00 2001 From: Karl Blomster Date: Sun, 13 Jan 2008 20:25:47 +0000 Subject: [PATCH] Made SetVideo discard keyframe data if every frame in the video is a keyframe. Fixes #547. Originally committed to SVN as r1699. --- aegisub/changelog.txt | 1 + aegisub/video_context.cpp | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/aegisub/changelog.txt b/aegisub/changelog.txt index 0f15cb5d2..0e5a15768 100644 --- a/aegisub/changelog.txt +++ b/aegisub/changelog.txt @@ -30,6 +30,7 @@ Please visit http://aegisub.net to download latest version o CSRI support for subtitles on all platforms. (equinox/AMZ) o Framegrabs from the video now also includes framenumber in the filename. (jfs) o Added a toggleable overscan mask to show which areas might get cropped by televisions. (AMZ) + o Keyframe data will no longer be loaded for video files which are all keyframes (i.e. most lossless AVI files) since it was meaningless. (TheFluff) - Visual Typesetting functionality implemented, which should make typesetting much easier and faster. It supports: (AMZ) o Dragging, including support for \move; o Rotation on Z axis; diff --git a/aegisub/video_context.cpp b/aegisub/video_context.cpp index 39c443288..eb292e2f9 100644 --- a/aegisub/video_context.cpp +++ b/aegisub/video_context.cpp @@ -297,7 +297,23 @@ void VideoContext::SetVideo(const wxString &filename) { #endif keyFramesLoaded = true; } + + // Check if the file is all keyframes + bool isAllKeyFrames = true; + for (unsigned int i=1; i