Merge svn changes up to r30675

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.
-
-

DOCS/tech/mirrors/update_mplayer_rsync

@@ -36,4 +36,3 @@ then
   mailx -s "MPlayer mirror" $MAILADR < $TMPFILE
 fi
 rm -f $TMPFILE
-

DOCS/tech/osd.txt

@@ -84,4 +84,3 @@ typedef struct mp_osd_obj_s {
 	} group;
     } params;
 } mp_osd_obj_t;
-

DOCS/tech/realcodecs/streaming.txt

@@ -56,5 +56,3 @@ ulong  blocksize
 ushort streamid
 uchar  reserved
 uchar  flags 1=reliable, 2=keyframe
-
-

DOCS/tech/release-howto.txt

@@ -58,4 +58,3 @@ Update release version in #mplayer topic
 Update project page on Freshmeat
 
 Done.
-

DOCS/tech/wishlist

@@ -179,4 +179,3 @@ Difficult stuff:
  * encode and display video at the same time
 
  * write mpimage for displaying pictures
-

DOCS/xml/cs/faq.xml

@@ -1293,4 +1293,3 @@ v souboru <filename>TOOLS/README</filename>.
 </qandaset>
 
 </chapter>
-

TOOLS/countquant.pl

@@ -33,5 +33,3 @@ while (<STDIN>) {
 }
 
 display_quants();
-
-

TOOLS/dvd2divxscript.pl

@@ -254,11 +254,3 @@ if ($shutdown) {
 	exit;
 }
 exit;
-
-
-
-
-
-
-
-

TOOLS/psnr-video.sh

@@ -177,4 +177,3 @@ rm -r ${TEMPDIR}
 
 echo "Created ${WORKDIR}/$OUTFILE"
 echo
-

TOOLS/wma2ogg.pl

@@ -338,4 +338,3 @@ sub decode {
 	}
 	print "\n\nDone.\n\n";
 }
-

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

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.
-

etc/dvb-menu.conf

@@ -104,5 +104,3 @@
       <e name="Console" ok="set_menu console0"/>
       <e name="Quit" ok="quit"/>
 </cmdlist>
-
-

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"
-

libvo/vo_matrixview.c

@@ -322,4 +322,3 @@ static int control(uint32_t request, void *data)
     }
     return VO_NOTIMPL;
 }
-

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}};
-

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

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

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);
 }
-

mp3lib/dct64_sse.c

@@ -421,4 +421,3 @@ void dct64_sse(short *out0,short *out1,real *c)
 #endif
     out1[0] = out0[0];
 }
-

mp3lib/decode_mmx.c

@@ -368,4 +368,3 @@ ASMALIGN(4)
 	:"memory", "%eax");
     return 0;
 }
-

mp3lib/tabinit.c

@@ -73,5 +73,3 @@ static void make_decode_tables(long scaleval)
       scaleval = - scaleval;
   }
 }
-
-

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