stream layer cleanup - part 1

STREAMTYPE_MF removed, using STREAMTYPE_DUMMY instead
mf.c/demux_mf updated to do the opening in demux_open instead of stream_open


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7408 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 3 insertions, 5 deletions

diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c
index bc6d97704c..434a426185 100644
--- a/libmpdemux/mf.c
+++ b/libmpdemux/mf.c
@@ -24,8 +24,7 @@ int    mf_h = 288;
 float  mf_fps = 25.0;
 char * mf_type = "jpg";
 
-int stream_open_mf(char * filename,stream_t * stream)
-{
+mf_t* open_mf(char * filename){
  glob_t        gg;
  struct stat   fs;
  int           i;
@@ -70,7 +69,7 @@ int stream_open_mf(char * filename,stream_t * stream)
    mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] search expr: %s\n",fname );
 
    if ( glob( fname,0,NULL,&gg ) )
-    { free( mf ); free( fname ); return 0; }
+    { free( mf ); free( fname ); return NULL; }
 
    mf->nr_of_files=gg.gl_pathc;
    mf->names=malloc( gg.gl_pathc * sizeof( char* ) );
@@ -111,7 +110,6 @@ int stream_open_mf(char * filename,stream_t * stream)
 
 exit_mf:
  free( fname );
- stream->priv=(void*)mf;
- return 1;
+ return mf;
 }