diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-16 05:00:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:41:05 +0300 |
| commit | d3d12332d647d2e9281220b84050518bc3f0cb03 (patch) | |
| tree | e29595a243a7f2e9911db08605a9d20c4ce29f19 /libmpdemux/demuxer.h | |
| parent | 732ee3474ac23a16f0ed7e791c0a5f8160a11ebd (diff) | |
| download | mpv-d3d12332d647d2e9281220b84050518bc3f0cb03.tar.bz2 mpv-d3d12332d647d2e9281220b84050518bc3f0cb03.tar.xz | |
Declare demuxer *_streams fields with proper types
Give sh_audio_t, sh_video_t and sh_sub_t which before had typedef
names only a matching struct name (without _t) too.
Change the a_streams, v_streams and s_streams demuxer fields from
void * to struct sh_audio *, struct sh_video * and struct sh_sub *.
Remove a now unnecessary cast from mplayer.c.
Diffstat (limited to 'libmpdemux/demuxer.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index ce7f872db7..a72e3f8a45 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -211,9 +211,9 @@ typedef struct demuxer_st { demux_stream_t *sub; // dvd subtitle buffer/demuxer // stream headers: - void* a_streams[MAX_A_STREAMS]; // audio streams (sh_audio_t) - void* v_streams[MAX_V_STREAMS]; // video sterams (sh_video_t) - void *s_streams[MAX_S_STREAMS]; // dvd subtitles (flag) + struct sh_audio *a_streams[MAX_A_STREAMS]; + struct sh_video *v_streams[MAX_V_STREAMS]; + struct sh_sub *s_streams[MAX_S_STREAMS]; demux_chapter_t* chapters; int num_chapters; |