Merge svn changes up to r30463

Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.

1 files changed, 24 insertions, 7 deletions

diff --git a/libmpcodecs/ad_msadpcm.c b/libmpcodecs/ad_msadpcm.c
index c6e6c4fc55..162c7c04d3 100644
--- a/libmpcodecs/ad_msadpcm.c
+++ b/libmpcodecs/ad_msadpcm.c
@@ -1,11 +1,28 @@
 /*
-    MS ADPCM Decoder for MPlayer
-      by Mike Melanson
-
-    This file is responsible for decoding Microsoft ADPCM data.
-    Details about the data format can be found here:
-      http://www.pcisys.net/~melanson/codecs/
-*/
+ * MS ADPCM decoder
+ *
+ * This file is responsible for decoding Microsoft ADPCM data.
+ * Details about the data format can be found here:
+ *   http://www.pcisys.net/~melanson/codecs/
+ *
+ * Copyright (c) 2002 Mike Melanson
+ *
+ * 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>