summaryrefslogtreecommitdiffstats
path: root/mp3lib
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 19:34:30 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 19:34:30 +0200
commit5c6795a687cd9149e57985b632cf7a1c4a5c8310 (patch)
tree60f61ddbcd8aa96f04b9851029923d81d0b0be89 /mp3lib
parent8a93561c8187058ae6278c9c6adb5ada7bedeff4 (diff)
parentd7a1d12f6147b53944a56117feae66d8e0e52fb1 (diff)
downloadmpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.bz2
mpv-5c6795a687cd9149e57985b632cf7a1c4a5c8310.tar.xz
Merge svn changes up to r30494
Conflicts: libvo/vo_gl.c libvo/x11_common.c
Diffstat (limited to 'mp3lib')
-rw-r--r--mp3lib/test.c17
-rw-r--r--mp3lib/test2.c18
2 files changed, 35 insertions, 0 deletions
diff --git a/mp3lib/test.c b/mp3lib/test.c
index 8ae1c68d41..446d454008 100644
--- a/mp3lib/test.c
+++ b/mp3lib/test.c
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
#define DUMP_PCM
diff --git a/mp3lib/test2.c b/mp3lib/test2.c
index f9bcfc073f..ccedbecdbd 100644
--- a/mp3lib/test2.c
+++ b/mp3lib/test2.c
@@ -1,3 +1,21 @@
+/*
+ * 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 <stdlib.h>
#include <string.h>