diff options
Diffstat (limited to 'source/blender/avi/intern')
| -rw-r--r-- | source/blender/avi/intern/avi.c | 2 | ||||
| -rw-r--r-- | source/blender/avi/intern/codecs.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index 2011ced96d9..637d4be30fd 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -442,7 +442,9 @@ AviError AVI_open_movie (const char *name, AviMovie *movie) if (GET_FCC (movie->fp) != FCC("RIFF") || !(movie->size = GET_FCC (movie->fp))) + { return AVI_ERROR_FORMAT; + } movie->header = (AviMainHeader *) MEM_mallocN (sizeof (AviMainHeader), "movieheader"); diff --git a/source/blender/avi/intern/codecs.c b/source/blender/avi/intern/codecs.c index 73af7097994..2c244177655 100644 --- a/source/blender/avi/intern/codecs.c +++ b/source/blender/avi/intern/codecs.c @@ -46,10 +46,12 @@ void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat f return buffer; if (from != AVI_FORMAT_RGB24 && - to != AVI_FORMAT_RGB24) + to != AVI_FORMAT_RGB24) + { return avi_format_convert(movie, stream, - avi_format_convert (movie, stream, buffer, from, AVI_FORMAT_RGB24, size), - AVI_FORMAT_RGB24, to, size); + avi_format_convert(movie, stream, buffer, from, AVI_FORMAT_RGB24, size), + AVI_FORMAT_RGB24, to, size); + } switch (to) { case AVI_FORMAT_RGB24: |