Merge svn changes up to r28149

1 files changed, 21 insertions, 5 deletions

diff --git a/libmpdemux/parse_mp4.c b/libmpdemux/parse_mp4.c
index 02b00341c2..6e4441a17c 100644
--- a/libmpdemux/parse_mp4.c
+++ b/libmpdemux/parse_mp4.c
@@ -1,10 +1,26 @@
-/* parse_mp4.c - MP4 file format parser code
- * This file is part of MPlayer, see http://mplayerhq.hu/ for info.  
- * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
- * File licensed under the GPL, see http://www.fsf.org/ for more info.
+/*
+ * MP4 file format parser code
+ *
+ * Copyright (C) 2002 Felix Buenemann <atmosfear at users.sourceforge.net>
  * Code inspired by libmp4 from http://mpeg4ip.sourceforge.net/.
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer 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 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-   
+
 #include <stdio.h>
 #include <inttypes.h>
 #ifdef HAVE_MALLOC_H