diff options
| -rw-r--r-- | libmpdemux/stheader.h | 5 | ||||
| -rw-r--r-- | mencoder.c | 1 | ||||
| -rw-r--r-- | mplayer.c | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index b869ba3146..5d1473be6a 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -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; diff --git a/mencoder.c b/mencoder.c index b1c50d7421..9ef7835c8f 100644 --- a/mencoder.c +++ b/mencoder.c @@ -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){ @@ -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; } |