24 files changed, 6 insertions, 37 deletions
diff --git a/DOCS/tech/code-documentation.txt b/DOCS/tech/code-documentation.txt
index b3d024e85a..9213a79715 100644
--- a/DOCS/tech/code-documentation.txt
+++ b/DOCS/tech/code-documentation.txt
@@ -130,5 +130,3 @@ There are a couple of special tags for doxygen:
 
 For a complete list of tags please read section 20 "Special commands" of the
 doxygen manual.
-
-
diff --git a/DOCS/tech/mirrors/update_mplayer_rsync b/DOCS/tech/mirrors/update_mplayer_rsync
index 7d4890cce3..cafaabe594 100644
--- a/DOCS/tech/mirrors/update_mplayer_rsync
+++ b/DOCS/tech/mirrors/update_mplayer_rsync
@@ -36,4 +36,3 @@ then
   mailx -s "MPlayer mirror" $MAILADR < $TMPFILE
 fi
 rm -f $TMPFILE
-
diff --git a/DOCS/tech/osd.txt b/DOCS/tech/osd.txt
index f5cf7f37c0..e4af53fe09 100644
--- a/DOCS/tech/osd.txt
+++ b/DOCS/tech/osd.txt
@@ -84,4 +84,3 @@ typedef struct mp_osd_obj_s {
 	} group;
     } params;
 } mp_osd_obj_t;
-
diff --git a/DOCS/tech/realcodecs/streaming.txt b/DOCS/tech/realcodecs/streaming.txt
index 3761c04b5a..091d0d671f 100644
--- a/DOCS/tech/realcodecs/streaming.txt
+++ b/DOCS/tech/realcodecs/streaming.txt
@@ -56,5 +56,3 @@ ulong  blocksize
 ushort streamid
 uchar  reserved
 uchar  flags 1=reliable, 2=keyframe
-
-
diff --git a/DOCS/tech/release-howto.txt b/DOCS/tech/release-howto.txt
index b490f80283..403370b125 100644
--- a/DOCS/tech/release-howto.txt
+++ b/DOCS/tech/release-howto.txt
@@ -58,4 +58,3 @@ Update release version in #mplayer topic
 Update project page on Freshmeat
 
 Done.
-
diff --git a/DOCS/tech/wishlist b/DOCS/tech/wishlist
index 2206b20f8e..90a3619974 100644
--- a/DOCS/tech/wishlist
+++ b/DOCS/tech/wishlist
@@ -179,4 +179,3 @@ Difficult stuff:
  * encode and display video at the same time
 
  * write mpimage for displaying pictures
-
diff --git a/DOCS/xml/cs/faq.xml b/DOCS/xml/cs/faq.xml
index 2eb8fbbce7..fbea20297f 100644
--- a/DOCS/xml/cs/faq.xml
+++ b/DOCS/xml/cs/faq.xml
@@ -1293,4 +1293,3 @@ v souboru <filename>TOOLS/README</filename>.
 </qandaset>
 
 </chapter>
-
diff --git a/TOOLS/countquant.pl b/TOOLS/countquant.pl
index 2b19c5b79d..4256fa0bc7 100755
--- a/TOOLS/countquant.pl
+++ b/TOOLS/countquant.pl
@@ -33,5 +33,3 @@ while (<STDIN>) {
 }
 
 display_quants();
-
-
diff --git a/TOOLS/dvd2divxscript.pl b/TOOLS/dvd2divxscript.pl
index 3c9203905c..6cc5f4d91a 100755
--- a/TOOLS/dvd2divxscript.pl
+++ b/TOOLS/dvd2divxscript.pl
@@ -254,11 +254,3 @@ if ($shutdown) {
 	exit;
 }
 exit;
-
-
-
-
-
-
-
-
diff --git a/TOOLS/psnr-video.sh b/TOOLS/psnr-video.sh
index 8f2603ce65..d06ed0d880 100755
--- a/TOOLS/psnr-video.sh
+++ b/TOOLS/psnr-video.sh
@@ -177,4 +177,3 @@ rm -r ${TEMPDIR}
 
 echo "Created ${WORKDIR}/$OUTFILE"
 echo
-
diff --git a/TOOLS/wma2ogg.pl b/TOOLS/wma2ogg.pl
index 7b81b430f4..dcd4d7e994 100755
--- a/TOOLS/wma2ogg.pl
+++ b/TOOLS/wma2ogg.pl
@@ -338,4 +338,3 @@ sub decode {
 	}
 	print "\n\nDone.\n\n";
 }
-
diff --git a/asxparser.h b/asxparser.h
index c5a3b18fc7..5060c331ae 100644
--- a/asxparser.h
+++ b/asxparser.h
@@ -19,6 +19,8 @@
 #ifndef MPLAYER_ASXPARSER_H
 #define MPLAYER_ASXPARSER_H
 
+#include "playtree.h"
+
 typedef struct ASX_Parser_t ASX_Parser_t;
 
 typedef struct {
@@ -69,4 +71,7 @@ typedef void (*ASX_FreeFunc)(void* arg);
 void
 asx_list_free(void* list_ptr,ASX_FreeFunc free_func);
 
+play_tree_t*
+asx_parser_build_tree(struct m_config *mconfig, char* buffer, int ref);
+
 #endif /* MPLAYER_ASXPARSER_H */
diff --git a/debian/copyright b/debian/copyright
index 70645ee1b5..9aec96a800 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,4 +5,3 @@ Original source can be found at: http://www.mplayerHQ.hu/homepage/
 
 Copyrighted by various authors. Licensed under the terms of GNU GPL.
 See /usr/share/common-licenses/GPL for details.
-
diff --git a/etc/dvb-menu.conf b/etc/dvb-menu.conf
index 3fd0d11aaa..7da289048e 100644
--- a/etc/dvb-menu.conf
+++ b/etc/dvb-menu.conf
@@ -104,5 +104,3 @@
       <e name="Console" ok="set_menu console0"/>
       <e name="Quit" ok="quit"/>
 </cmdlist>
-
-
diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h
index 7195615efd..88ba62c045 100644
--- a/help/help_mp-ru.h
+++ b/help/help_mp-ru.h
@@ -2114,4 +2114,3 @@ static const char help_text[]=
 
 // url.c
 #define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "Похоже, что строка уже пропущена в url_escape %c%c1%c2\n"
-
diff --git a/libvo/vo_matrixview.c b/libvo/vo_matrixview.c
index 002494b0bd..7cc142a071 100644
--- a/libvo/vo_matrixview.c
+++ b/libvo/vo_matrixview.c
@@ -322,4 +322,3 @@ static int control(uint32_t request, void *data)
     }
     return VO_NOTIMPL;
 }
-
diff --git a/loader/dmo/dmo_guids.c b/loader/dmo/dmo_guids.c
index 8dbeb40459..484d4564e2 100644
--- a/loader/dmo/dmo_guids.c
+++ b/loader/dmo/dmo_guids.c
@@ -39,4 +39,3 @@ const GUID DMOCATEGORY_AUDIO_NOISE_SUPPRESS = { 0xe07f903f, 0x62fd, 0x4e60,
 
 const GUID DMOCATEGORY_AGC = { 0xe88c9ba0l, 0xc557, 0x11d0,
 { 0x8a, 0x2b, 0x00, 0xa0, 0xc9, 0x25, 0x5a, 0xc1}};
-
diff --git a/loader/wine/pshpack1.h b/loader/wine/pshpack1.h
index 66f9864e37..5ab9b95061 100644
--- a/loader/wine/pshpack1.h
+++ b/loader/wine/pshpack1.h
@@ -10,4 +10,3 @@
 #else /* MPLAYER_PSHPACK_H */
 #error "Nested pushing of alignment isn't supported by the compiler"
 #endif /* MPLAYER_PSHPACK_H */
-
diff --git a/loader/wine/pshpack4.h b/loader/wine/pshpack4.h
index 7adc453cf4..1b37492232 100644
--- a/loader/wine/pshpack4.h
+++ b/loader/wine/pshpack4.h
@@ -12,4 +12,3 @@
 #else /* MPLAYER_PSHPACK_H */
 #error "Nested pushing of alignment isn't supported by the compiler"
 #endif /* MPLAYER_PSHPACK_H */
-
diff --git a/mp3lib/dct64.c b/mp3lib/dct64.c
index 54ac3c3d6a..514aa4fc65 100644
--- a/mp3lib/dct64.c
+++ b/mp3lib/dct64.c
@@ -321,4 +321,3 @@ void mp3lib_dct64(real *a,real *b,real *c)
   real bufs[0x40];
   dct64_1(a,b,bufs,bufs+0x20,c);
 }
-
diff --git a/mp3lib/dct64_sse.c b/mp3lib/dct64_sse.c
index 2827f2c1b1..c2270ba9be 100644
--- a/mp3lib/dct64_sse.c
+++ b/mp3lib/dct64_sse.c
@@ -421,4 +421,3 @@ void dct64_sse(short *out0,short *out1,real *c)
 #endif
     out1[0] = out0[0];
 }
-
diff --git a/mp3lib/decode_mmx.c b/mp3lib/decode_mmx.c
index e850034254..de48cd41b7 100644
--- a/mp3lib/decode_mmx.c
+++ b/mp3lib/decode_mmx.c
@@ -368,4 +368,3 @@ ASMALIGN(4)
 	:"memory", "%eax");
     return 0;
 }
-
diff --git a/mp3lib/tabinit.c b/mp3lib/tabinit.c
index 513d268eff..79ac1c9f15 100644
--- a/mp3lib/tabinit.c
+++ b/mp3lib/tabinit.c
@@ -73,5 +73,3 @@ static void make_decode_tables(long scaleval)
       scaleval = - scaleval;
   }
 }
-
-
diff --git a/playtreeparser.c b/playtreeparser.c
index 8868d20694..65deefff6d 100644
--- a/playtreeparser.c
+++ b/playtreeparser.c
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
+#include "asxparser.h"
 #include "m_config.h"
 #include "playtree.h"
 #include "playtreeparser.h"
@@ -37,9 +38,6 @@
 #include "libmpdemux/demuxer.h"
 #include "mp_msg.h"
 
-struct m_config;
-extern play_tree_t*
-asx_parser_build_tree(struct m_config *mconfig, char* buffer, int ref);
 
 #define BUF_STEP 1024