[MPlayer-cvslog] r24919 - in trunk: libmpdemux/stheader.h mencoder.c mplayer.c

[uau]

Author: uau
Date: Thu Nov  1 07:52:14 2007
New Revision: 24919

Log:
Clean up some fields in stheader.h structs

sh_video_t: void *video_out: only assigned to, never read. Remove.
sh_video_t: void *vfilter: change type to struct vf_instance_s *
sh_audio_t: void *afilter: change type to struct af_stream_s *

The latter two never hold different types so there's no reason to use
void *. Maybe they were originally defined that way because the
option of using pointers to incomplete struct types was missed (the
typedefs vf_instance_t and af_stream_t would require extra headers)?


Modified:
   trunk/libmpdemux/stheader.h
   trunk/mencoder.c
   trunk/mplayer.c

Modified: trunk/libmpdemux/stheader.h
==============================================================================
--- trunk/libmpdemux/stheader.h	(original)
+++ trunk/libmpdemux/stheader.h	Thu Nov  1 07:52:14 2007
@@ -35,7 +35,7 @@ typedef struct {
   int a_out_buffer_len;
   int a_out_buffer_size;
 //  void* audio_out;        // the audio_out handle, used for this audio stream
-  void* afilter;          // the audio filter stream
+  struct af_stream_s *afilter;          // the audio filter stream
   struct ad_functions_s* ad_driver;
 #ifdef DYNAMIC_PLUGINS
   void *dec_handle;
@@ -78,8 +78,7 @@ typedef struct {
   int disp_w,disp_h;      // display size (filled by fileformat parser)
   // output driver/filters: (set by libmpcodecs core)
   unsigned int outfmtidx;
-  void* video_out;        // the video_out handle, used for this video stream
-  void* vfilter;          // the video filter chain, used for this video stream
+  struct vf_instance_s *vfilter;          // the video filter chain, used for this video stream
   int vf_inited;
 #ifdef DYNAMIC_PLUGINS
   void *dec_handle;

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	(original)
+++ trunk/mencoder.c	Thu Nov  1 07:52:14 2007
@@ -778,7 +778,6 @@ mux_v->codec=out_video_codec;
 mux_v->bih=NULL;
 }
 sh_video->codec=NULL;
-sh_video->video_out=NULL;
 sh_video->vfilter=NULL; // fixme!
 
 switch(mux_v->codec){

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Thu Nov  1 07:52:14 2007
@@ -1900,7 +1900,6 @@ int reinit_video_chain(void) {
       mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice);
       goto err_out;
     }
-    sh_video->video_out=mpctx->video_out;
     inited_flags|=INITED_VO;
   }