summaryrefslogtreecommitdiff
path: root/src/im_format_avi.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/im_format_avi.cpp')
-rw-r--r--src/im_format_avi.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/im_format_avi.cpp b/src/im_format_avi.cpp
index dcb4898..a825f19 100644
--- a/src/im_format_avi.cpp
+++ b/src/im_format_avi.cpp
@@ -2,7 +2,7 @@
* \brief AVI - Windows Audio-Video Interleaved RIFF
*
* See Copyright Notice in im_lib.h
- * $Id: im_format_avi.cpp,v 1.3 2009/06/08 20:14:53 scuri Exp $
+ * $Id: im_format_avi.cpp,v 1.4 2009/06/14 17:02:34 scuri Exp $
*/
#include "im_format.h"
@@ -282,7 +282,7 @@ int imFileFormatAVI::ReadImageInfo(int index)
this->line_buffer_extra = 4; // room enough for padding
/* prepares to read data from the stream */
- if (bpp == 32)
+ if (bpp == 32 || bpp == 16)
{
BITMAPINFOHEADER info;
memset(&info, 0, sizeof(BITMAPINFOHEADER));
@@ -295,6 +295,7 @@ int imFileFormatAVI::ReadImageInfo(int index)
}
else
frame = AVIStreamGetFrameOpen(stream, NULL);
+
if (!frame)
return IM_ERR_ACCESS;