summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/AVIDump.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2016-07-21 17:32:55 +0200
committerGitHub <noreply@github.com>2016-07-21 17:32:55 +0200
commit76b1a4d7fab195ca416a80b031f17ba8ab060b5e (patch)
tree2e6dfe997245d602a61d651ee9194668863d8ce7 /Source/Core/VideoCommon/AVIDump.cpp
parentc7ead90a09ba702214a1a92a03c1de40fef9b188 (diff)
parent37a0c9c404e7cb0fe9149b0472a08a9c72715239 (diff)
Merge pull request #4039 from RisingFog/check_dump_height_split
Check for zero height when splitting video dump
Diffstat (limited to 'Source/Core/VideoCommon/AVIDump.cpp')
-rw-r--r--Source/Core/VideoCommon/AVIDump.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp
index b18b77dea4..c0a2613ea5 100644
--- a/Source/Core/VideoCommon/AVIDump.cpp
+++ b/Source/Core/VideoCommon/AVIDump.cpp
@@ -296,7 +296,12 @@ void AVIDump::DoState()
void AVIDump::CheckResolution(int width, int height)
{
- if (width != s_current_width || height != s_current_height)
+ // We check here to see if the requested width and height have changed since the last frame which
+ // was dumped, then create a new file accordingly. However, is it possible for the height
+ // (possibly width as well, but no examples known) to have a value of zero. This can occur as the
+ // VI is able to be set to a zero value for height/width to disable output. If this is the case,
+ // simply keep the last known resolution of the video for the added frame.
+ if ((width != s_current_width || height != s_current_height) && (width > 0 && height > 0))
{
int temp_file_index = s_file_index;
Stop();