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 f52ec44faab949c2bb8e95f99f3792ee989c477f..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.
  */