Merge branch 'blender2.7'

[blender.git] / source / blender / avi / intern / avi_codecs.c

diff --git a/source/blender/avi/intern/avi_codecs.c b/source/blender/avi/intern/avi_codecs.c
index e43826064a64977056e4d93daa6551e965410f85..569e490ca03841762f0891b3023ea439f549e0df 100644 (file)
--- a/source/blender/avi/intern/avi_codecs.c
+++ b/source/blender/avi/intern/avi_codecs.c
@@ -1,6 +1,4 @@
 /*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -17,16 +15,9 @@
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/avi/intern/avi_codecs.c
- *  \ingroup avi
+/** \file \ingroup avi
  *
  * This is external code. Identify and convert different avi-files.
  */
@@ -39,7 +30,7 @@
 #include "avi_mjpeg.h"
 #include "avi_rgb32.h"
 
-void *avi_format_convert(AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size)
+void *avi_format_convert(AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, size_t *size)
 {
        if (from == to)
                return buffer;
@@ -106,10 +97,8 @@ int avi_get_format_type(AviFormat format)
                case AVI_FORMAT_AVI_RGB:
                case AVI_FORMAT_MJPEG:
                        return FCC("vids");
-                       break;
                default:
                        return 0;
-                       break;
        }
 }
 
@@ -120,13 +109,10 @@ int avi_get_format_fcc(AviFormat format)
                case AVI_FORMAT_RGB32:
                case AVI_FORMAT_AVI_RGB:
                        return FCC("DIB ");
-                       break;
                case AVI_FORMAT_MJPEG:
                        return FCC("MJPG");
-                       break;
                default:
                        return 0;
-                       break;
        }
 }
 
@@ -137,12 +123,9 @@ int avi_get_format_compression(AviFormat format)
                case AVI_FORMAT_RGB32:
                case AVI_FORMAT_AVI_RGB:
                        return 0;
-                       break;
                case AVI_FORMAT_MJPEG:
                        return FCC("MJPG");
-                       break;
                default:
                        return 0;
-                       break;
        }
 }