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

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

Revision: 523
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=523&view=rev
Author:   nickols_k
Date:     2012-12-08 09:26:17 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
security patch: make struct Stream independed from Demuxer_Stream*

Modified Paths:
--------------
    mplayerxp/libmpdemux/demuxer.h
    mplayerxp/libmpstream/stream.cpp
    mplayerxp/libmpstream/stream.h

Modified: mplayerxp/libmpdemux/demuxer.h
===================================================================
--- mplayerxp/libmpdemux/demuxer.h	2012-12-08 09:17:54 UTC (rev 522)
+++ mplayerxp/libmpdemux/demuxer.h	2012-12-08 09:26:17 UTC (rev 523)
@@ -152,8 +152,6 @@
     inline Demuxer::demuxer_flags_e operator&=(Demuxer::demuxer_flags_e a, Demuxer::demuxer_flags_e b) { return (a=static_cast<Demuxer::demuxer_flags_e>(static_cast<unsigned>(a)&static_cast<unsigned>(b))); }
     inline Demuxer::demuxer_flags_e operator^=(Demuxer::demuxer_flags_e a, Demuxer::demuxer_flags_e b) { return (a=static_cast<Demuxer::demuxer_flags_e>(static_cast<unsigned>(a)^static_cast<unsigned>(b))); }
 
-    // This is defined here because demux_stream_t ins't defined in stream.h
-    Stream* __FASTCALL__	new_ds_stream(Demuxer_Stream *ds);
     Demuxer*			new_demuxers_demuxer(Demuxer* vd, Demuxer* ad, Demuxer* sd);
 }// namespace mpxp
 #endif

Modified: mplayerxp/libmpstream/stream.cpp
===================================================================
--- mplayerxp/libmpstream/stream.cpp	2012-12-08 09:17:54 UTC (rev 522)
+++ mplayerxp/libmpstream/stream.cpp	2012-12-08 09:26:17 UTC (rev 523)
@@ -98,12 +98,6 @@
     reset();
 }
 
-Stream::Stream(Demuxer_Stream* ds) {
-    _type=Stream::Type_DS;
-    driver=ds->demuxer->stream->driver;
-    priv = ds;
-}
-
 Stream::~Stream(){
     MSG_INFO("\n*** free_stream(drv:%s) called [errno: %s]***\n",driver_info->mrl,strerror(errno));
     if(driver) close();

Modified: mplayerxp/libmpstream/stream.h
===================================================================
--- mplayerxp/libmpstream/stream.h	2012-12-08 09:17:54 UTC (rev 522)
+++ mplayerxp/libmpstream/stream.h	2012-12-08 09:26:17 UTC (rev 523)
@@ -39,7 +39,6 @@
     };
 
     struct cache_vars_s;
-    class Demuxer_Stream;
     class Stream_Interface;
     struct stream_interface_info_t;
     /** Stream description */
@@ -58,7 +57,6 @@
 		Type_Menu	=0x00000100, /**< Stream contains DVD menu... */
 	    };
 	    Stream(type_e type=Stream::Type_Unknown);
-	    Stream(Demuxer_Stream* ds);
 	    virtual ~Stream();
 
 	    virtual MPXP_Rc	open(libinput_t*libinput,const char* filename,int* file_format,stream_callback event_handler);

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