[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[539] mplayerxp

[<nic...@us...>]

Revision: 539
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=539&view=rev
Author:   nickols_k
Date:     2012-12-11 15:24:51 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
anti-illegal patch cleanups: project compiled with -g3 lost >4MB of size. 117777K -> 112026K

Modified Paths:
--------------
    mplayerxp/dump.cpp
    mplayerxp/libmpcodecs/ad_internal.h
    mplayerxp/libmpcodecs/dec_video.h
    mplayerxp/libmpcodecs/vd_internal.h
    mplayerxp/libmpdemux/demux_y4m.cpp
    mplayerxp/libmpdemux/demuxer.h
    mplayerxp/libmpdemux/demuxer_r.h
    mplayerxp/libmpdemux/demuxer_stream.cpp
    mplayerxp/libmpdemux/yuv4mpeg.cpp
    mplayerxp/libmpdemux/yuv4mpeg.h
    mplayerxp/libmpstream/asf_mmst_streaming.cpp
    mplayerxp/libmpstream/asf_streaming.cpp
    mplayerxp/libmpstream/librtsp/rtsp.h
    mplayerxp/libmpstream/network.cpp
    mplayerxp/libmpstream/s_dvdnav.cpp
    mplayerxp/libmpstream/stream.cpp
    mplayerxp/libplaytree/playtree.h
    mplayerxp/libvo/sub.cpp
    mplayerxp/postproc/af_crystality.cpp
    mplayerxp/xmpcore/xmp_aplayer.cpp
    mplayerxp/xmpcore/xmp_core.h
    mplayerxp/xmpcore/xmp_vplayer.cpp

Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/dump.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -15,6 +15,7 @@
 #include "input2/input.h"
 #include "mplayerxp.h"
 #include "libmpdemux/muxer.h"
+#include "libmpstream/stream.h"
 #include "libmpstream/mrl.h"
 #define MSGT_CLASS MSGT_GLOBAL
 #include "mp_msg.h"

Modified: mplayerxp/libmpcodecs/ad_internal.h
===================================================================
--- mplayerxp/libmpcodecs/ad_internal.h	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpcodecs/ad_internal.h	2012-12-11 15:24:51 UTC (rev 539)
@@ -2,10 +2,7 @@
 #include "loader/wine/msacm.h"
 #endif
 #include "libmpconf/codec-cfg.h"
-
-#include "libmpstream/stream.h"
 #include "libmpdemux/demuxer_r.h"
-#include "libmpdemux/stheader.h"
 
 #include "ad.h"
 

Modified: mplayerxp/libmpcodecs/dec_video.h
===================================================================
--- mplayerxp/libmpcodecs/dec_video.h	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpcodecs/dec_video.h	2012-12-11 15:24:51 UTC (rev 539)
@@ -2,8 +2,6 @@
 #define DEC_VIDEO_H_INCLUDED 1
 #include "xmpcore/xmp_enums.h"
 #include "libmpdemux/demuxer_r.h"
-#include "libmpstream/stream.h"
-#include "libmpdemux/stheader.h"
 
 namespace mpxp {
     struct libinput_t;

Modified: mplayerxp/libmpcodecs/vd_internal.h
===================================================================
--- mplayerxp/libmpcodecs/vd_internal.h	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpcodecs/vd_internal.h	2012-12-11 15:24:51 UTC (rev 539)
@@ -2,10 +2,6 @@
 #include "libmpconf/codec-cfg.h"
 #include "libvo/img_format.h"
 
-#include "libmpstream/stream.h"
-#include "libmpdemux/demuxer_r.h"
-#include "libmpdemux/stheader.h"
-
 #include "vd.h"
 #include "vd_msg.h"
 // prototypes:

Modified: mplayerxp/libmpdemux/demux_y4m.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_y4m.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpdemux/demux_y4m.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -17,6 +17,7 @@
 #include "yuv4mpeg.h"
 
 //#include "stream.h"
+#include "libmpstream/stream.h"
 #include "demuxer.h"
 #include "demuxer_internal.h"
 #include "stheader.h"

Modified: mplayerxp/libmpdemux/demuxer.h
===================================================================
--- mplayerxp/libmpdemux/demuxer.h	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpdemux/demuxer.h	2012-12-11 15:24:51 UTC (rev 539)
@@ -4,7 +4,6 @@
 #include "osdep/mplib.h"
 using namespace mpxp;
 
-#include "libmpstream/stream.h"
 #include "xmpcore/xmp_enums.h"
 #include "libmpconf/cfgparser.h"
 #include "demuxer_packet.h"

Modified: mplayerxp/libmpdemux/demuxer_r.h
===================================================================
--- mplayerxp/libmpdemux/demuxer_r.h	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpdemux/demuxer_r.h	2012-12-11 15:24:51 UTC (rev 539)
@@ -4,7 +4,6 @@
 #include <pthread.h>
 #include <stdint.h>
 
-#include "libmpstream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 

Modified: mplayerxp/libmpdemux/demuxer_stream.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer_stream.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpdemux/demuxer_stream.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -2,6 +2,7 @@
 #include "osdep/mplib.h"
 using namespace mpxp;
 
+#include "libmpstream/stream.h"
 #include "demuxer_stream.h"
 #include "demuxer.h"
 #include "demuxer_internal.h"

Modified: mplayerxp/libmpdemux/yuv4mpeg.cpp
===================================================================
--- mplayerxp/libmpdemux/yuv4mpeg.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpdemux/yuv4mpeg.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -32,6 +32,7 @@
 #include "yuv4mpeg.h"
 #include "demux_msg.h"
 #include "yuv4mpeg_intern.h"
+#include "libmpstream/stream.h"
 
 /* quick test of two ratios for equality (i.e. identical components) */
 #define Y4M_RATIO_EQL(a,b) ( ((a).n == (b).n) && ((a).d == (b).d) )
@@ -50,8 +51,6 @@
 	return old;
 }
 
-
-
 /*************************************************************************
  *
  * Convenience functions for fd read/write

Modified: mplayerxp/libmpdemux/yuv4mpeg.h
===================================================================
--- mplayerxp/libmpdemux/yuv4mpeg.h	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpdemux/yuv4mpeg.h	2012-12-11 15:24:51 UTC (rev 539)
@@ -28,9 +28,10 @@
 #define __YUV4MPEG_H__
 
 #include <stdlib.h>
-#include "libmpstream/stream.h"
 
-
+namespace mpxp {
+    struct Stream;
+}
 /************************************************************************
  *  error codes returned by y4m_* functions
  ************************************************************************/

Modified: mplayerxp/libmpstream/asf_mmst_streaming.cpp
===================================================================
--- mplayerxp/libmpstream/asf_mmst_streaming.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpstream/asf_mmst_streaming.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -20,7 +20,6 @@
 #include "mplayerxp.h"
 #include "tcp.h"
 #include "url.h"
-#include "libmpdemux/asf.h"
 #include "stream.h"
 
 #include "network.h"

Modified: mplayerxp/libmpstream/asf_streaming.cpp
===================================================================
--- mplayerxp/libmpstream/asf_streaming.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpstream/asf_streaming.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -20,10 +20,10 @@
 #include "url.h"
 #include "tcp.h"
 #include "http.h"
-#include "libmpdemux/asf.h"
 
 #include "stream.h"
 #include "asf_streaming.h"
+#include "libmpdemux/asf.h"
 #include "network.h"
 #include "stream_msg.h"
 

Modified: mplayerxp/libmpstream/librtsp/rtsp.h
===================================================================
--- mplayerxp/libmpstream/librtsp/rtsp.h	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpstream/librtsp/rtsp.h	2012-12-11 15:24:51 UTC (rev 539)
@@ -31,8 +31,8 @@
 
 #ifndef HAVE_RTSP_H
 #define HAVE_RTSP_H
+#include "libmpstream/tcp.h"
 
-
 /* some codes returned by rtsp_request_* functions */
 enum {
     RTSP_STATUS_SET_PARAMETER	=10,

Modified: mplayerxp/libmpstream/network.cpp
===================================================================
--- mplayerxp/libmpstream/network.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpstream/network.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -28,9 +28,7 @@
 #endif
 
 #include "stream.h"
-#include "libmpdemux/demuxer.h"
 #include "libmpconf/cfgparser.h"
-#include "libmpdemux/mpdemux.h"
 #include "help_mp.h"
 
 #include "tcp.h"
@@ -39,7 +37,6 @@
 #include "cookies.h"
 #include "url.h"
 #include "udp.h"
-#include "libmpdemux/asf.h"
 #include "pnm.h"
 #ifndef STREAMING_LIVE_DOT_COM
 #include "rtp.h"
@@ -63,42 +60,6 @@
 net_config_t::~net_config_t() {}
 net_config_t net_conf;
 
-static const struct {
-    const char *mime_type;
-    int demuxer_type;
-} mime_type_table[] = {
-    // MP3 networking, some MP3 networking server answer with audio/mpeg
-    { "audio/mpeg", Demuxer::Type_AUDIO },
-    // MPEG networking
-    { "video/mpeg", Demuxer::Type_UNKNOWN },
-    { "video/x-mpeg", Demuxer::Type_UNKNOWN },
-    { "video/x-mpeg2", Demuxer::Type_UNKNOWN },
-    // AVI ??? => video/x-msvideo
-    { "video/x-msvideo", Demuxer::Type_AVI },
-    // MOV => video/quicktime
-    { "video/quicktime", Demuxer::Type_MOV },
-    // ASF
-    { "audio/x-ms-wax", Demuxer::Type_ASF },
-    { "audio/x-ms-wma", Demuxer::Type_ASF },
-    { "video/x-ms-asf", Demuxer::Type_ASF },
-    { "video/x-ms-afs", Demuxer::Type_ASF },
-    { "video/x-ms-wvx", Demuxer::Type_ASF },
-    { "video/x-ms-wmv", Demuxer::Type_ASF },
-    { "video/x-ms-wma", Demuxer::Type_ASF },
-    // Playlists
-    { "video/x-ms-wmx", Demuxer::Type_PLAYLIST },
-    { "audio/x-scpls", Demuxer::Type_PLAYLIST },
-    { "audio/x-mpegurl", Demuxer::Type_PLAYLIST },
-    { "audio/x-pls", Demuxer::Type_PLAYLIST },
-    // Real Media
-    { "audio/x-pn-realaudio", Demuxer::Type_REAL },
-    // OGG Streaming
-    { "application/x-ogg", Demuxer::Type_OGG },
-    // NullSoft Streaming Video
-    { "video/nsv", Demuxer::Type_NSV},
-    { "misc/ultravox", Demuxer::Type_NSV}
-};
-
 networking_t* new_networking() {
     networking_t *networking = new(zeromem) networking_t;
     if( networking==NULL ) {
@@ -359,7 +320,6 @@
 // we might be able to guess the networking type.
 static MPXP_Rc autodetectProtocol(networking_t *networking, Tcp& tcp) {
     HTTP_Header *http_hdr=NULL;
-    unsigned int i;
     int redirect;
     int auth_retry=0;
     MPXP_Rc seekable=MPXP_False;
@@ -457,12 +417,6 @@
 			MSG_V("Content-Type: [%s]\n", content_type );
 			if( (content_length = http_hdr->get_field("Content-Length")) != NULL)
 			    MSG_V("Content-Length: [%s]\n", http_hdr->get_field("Content-Length"));
-			// Check in the mime type table for a demuxer type
-			for( i=0 ; i<(sizeof(mime_type_table)/sizeof(mime_type_table[0])) ; i++ ) {
-			    if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) {
-				return seekable;
-			    }
-			}
 		    }
 		    // Not found in the mime type table, don't fail,
 		    // we should try raw HTTP

Modified: mplayerxp/libmpstream/s_dvdnav.cpp
===================================================================
--- mplayerxp/libmpstream/s_dvdnav.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpstream/s_dvdnav.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -12,7 +12,6 @@
 #include "stream.h"
 #include "stream_internal.h"
 #include "help_mp.h"
-#include "libmpdemux/demuxer.h"
 #include "libmpsub/spudec.h"
 #include "libvo/sub.h"
 #include "input2/input.h"

Modified: mplayerxp/libmpstream/stream.cpp
===================================================================
--- mplayerxp/libmpstream/stream.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libmpstream/stream.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -24,7 +24,6 @@
 
 #include "stream.h"
 #include "stream_internal.h"
-#include "libmpdemux/demuxer.h"
 #include "stream_msg.h"
 
 namespace mpxp {

Modified: mplayerxp/libplaytree/playtree.h
===================================================================
--- mplayerxp/libplaytree/playtree.h	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libplaytree/playtree.h	2012-12-11 15:24:51 UTC (rev 539)
@@ -1,7 +1,10 @@
 #ifndef __PLAYTREE_H
 #define __PLAYTREE_H
-#include "libmpstream/stream.h"
 
+namespace mpxp {
+    struct Stream;
+}
+
 enum {
     PLAY_TREE_ITER_ERROR=0,
     PLAY_TREE_ITER_ENTRY=1,

Modified: mplayerxp/libvo/sub.cpp
===================================================================
--- mplayerxp/libvo/sub.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/libvo/sub.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -7,6 +7,7 @@
 #include <string.h>
 
 #include "mplayerxp.h"
+#include "libmpstream/stream.h" // for nav_hl
 #include "xmpcore/xmp_core.h"
 #include "video_out.h"
 #include "font_load.h"

Modified: mplayerxp/postproc/af_crystality.cpp
===================================================================
--- mplayerxp/postproc/af_crystality.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/postproc/af_crystality.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -63,15 +63,12 @@
 #include <math.h>
 #include <limits.h>
 
+#include "libmpdemux/stheader.h"
 #include "mplayerxp.h"
 #include "af.h"
 #include "af_internal.h"
 #include "aflib.h"
 
-#include "libmpstream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
-
 #define SAMPLE_MAX 1.0f
 
 //#define SAMPLE_MAX 1.0 /* for float32 */

Modified: mplayerxp/xmpcore/xmp_aplayer.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_aplayer.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/xmpcore/xmp_aplayer.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -12,6 +12,7 @@
 #include "mp_msg.h"
 #include "sig_hand.h"
 
+#include "libmpdemux/demuxer.h"
 #include "libmpcodecs/dec_audio.h"
 #include "libao2/audio_out.h"
 

Modified: mplayerxp/xmpcore/xmp_core.h
===================================================================
--- mplayerxp/xmpcore/xmp_core.h	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/xmpcore/xmp_core.h	2012-12-11 15:24:51 UTC (rev 539)
@@ -14,10 +14,8 @@
 #include "osdep/mplib.h"
 using namespace mpxp;
 
-#include "libmpdemux/demuxer_r.h"
-#include "libmpstream/stream.h"
-#include "libmpdemux/stheader.h"
 #include "libvo/video_out.h"
+#include "libmpdemux/stheader.h"
 
 namespace mpxp {
     enum xp_modes { XP_NA=0, XP_UniCore, XP_DualCore, XP_TripleCore, XP_MultiCore };

Modified: mplayerxp/xmpcore/xmp_vplayer.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_vplayer.cpp	2012-12-11 14:15:08 UTC (rev 538)
+++ mplayerxp/xmpcore/xmp_vplayer.cpp	2012-12-11 15:24:51 UTC (rev 539)
@@ -11,8 +11,8 @@
 #include "libao2/audio_out.h"
 #include "libvo/video_out.h"
 
+#include "libmpdemux/demuxer_r.h"
 #include "osdep/timer.h"
-#include "libmpdemux/demuxer.h"
 #include "mplayerxp.h"
 #include "xmp_core.h"
 #include "xmp_adecoder.h"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.