diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-26 19:17:04 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-26 19:17:04 +0000 |
commit | ccf75d67117745e3ed868d0f1c956f078f13a4fa (patch) | |
tree | b5a87e723273c61279c39b1491b685519d4a2086 /libmpdemux/stheader.h | |
parent | 8b4274d71f055c9c1354413933c4ba071bfac288 (diff) | |
download | mpv-ccf75d67117745e3ed868d0f1c956f078f13a4fa.tar.bz2 mpv-ccf75d67117745e3ed868d0f1c956f078f13a4fa.tar.xz |
Get rid of demux_aid_vid_mismatch mess.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/stheader.h')
-rw-r--r-- | libmpdemux/stheader.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index bdb36d4002..9acfd22a34 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -7,6 +7,7 @@ // Stream headers: typedef struct { + int aid; demux_stream_t *ds; struct codecs_st *codec; unsigned int format; @@ -52,6 +53,7 @@ typedef struct { } sh_audio_t; typedef struct { + int vid; demux_stream_t *ds; struct codecs_st *codec; unsigned int format; @@ -89,8 +91,10 @@ typedef struct { } sh_video_t; // demuxer.c: -sh_audio_t* new_sh_audio(demuxer_t *demuxer,int id); -sh_video_t* new_sh_video(demuxer_t *demuxer,int id); +#define new_sh_audio(d, i) new_sh_audio_aid(d, i, i) +sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid); +#define new_sh_video(d, i) new_sh_video_vid(d, i, i) +sh_video_t* new_sh_video_vid(demuxer_t *demuxer,int id,int vid); void free_sh_audio(demuxer_t *demuxer, int id); void free_sh_video(sh_video_t *sh); |