github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-05 03:06:28 +01:00
Code Releases Activity

Clean up some fields in stheader.h structs

Browse Source 
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)?


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24919 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
uau 2007-11-01 06:52:14 +00:00
parent 5bfedc0a2d
commit a6d6f18216
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmpdemux/stheader.h
View File

@ -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;

1
mencoder.c
View File

@ -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){

1
mplayer.c
View File

@ -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;
}