Mercurial > mplayer.hg
comparison libmpdemux/stheader.h @ 24891:fefb019faa90
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)?
author | uau |
---|---|
date | Thu, 01 Nov 2007 06:52:14 +0000 |
parents | 725638f690bb |
children | 3baf6a2283da |
comparison
equal
deleted
inserted
replaced
24890:a54a25221b79 | 24891:fefb019faa90 |
---|---|
33 // output buffers: | 33 // output buffers: |
34 char* a_out_buffer; | 34 char* a_out_buffer; |
35 int a_out_buffer_len; | 35 int a_out_buffer_len; |
36 int a_out_buffer_size; | 36 int a_out_buffer_size; |
37 // void* audio_out; // the audio_out handle, used for this audio stream | 37 // void* audio_out; // the audio_out handle, used for this audio stream |
38 void* afilter; // the audio filter stream | 38 struct af_stream_s *afilter; // the audio filter stream |
39 struct ad_functions_s* ad_driver; | 39 struct ad_functions_s* ad_driver; |
40 #ifdef DYNAMIC_PLUGINS | 40 #ifdef DYNAMIC_PLUGINS |
41 void *dec_handle; | 41 void *dec_handle; |
42 #endif | 42 #endif |
43 // win32-compatible codec parameters: | 43 // win32-compatible codec parameters: |
76 float stream_aspect; // aspect ratio stored in the media headers (e.g. in DVD IFO files) | 76 float stream_aspect; // aspect ratio stored in the media headers (e.g. in DVD IFO files) |
77 int i_bps; // == bitrate (compressed bytes/sec) | 77 int i_bps; // == bitrate (compressed bytes/sec) |
78 int disp_w,disp_h; // display size (filled by fileformat parser) | 78 int disp_w,disp_h; // display size (filled by fileformat parser) |
79 // output driver/filters: (set by libmpcodecs core) | 79 // output driver/filters: (set by libmpcodecs core) |
80 unsigned int outfmtidx; | 80 unsigned int outfmtidx; |
81 void* video_out; // the video_out handle, used for this video stream | 81 struct vf_instance_s *vfilter; // the video filter chain, used for this video stream |
82 void* vfilter; // the video filter chain, used for this video stream | |
83 int vf_inited; | 82 int vf_inited; |
84 #ifdef DYNAMIC_PLUGINS | 83 #ifdef DYNAMIC_PLUGINS |
85 void *dec_handle; | 84 void *dec_handle; |
86 #endif | 85 #endif |
87 // win32-compatible codec parameters: | 86 // win32-compatible codec parameters: |