Mercurial > mplayer.hg

diff libmpdemux/stheader.h @ 19540:70a5e89ea4cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of demux_aid_vid_mismatch mess.
author reimar
date Sat, 26 Aug 2006 19:17:04 +0000
parents d9a75b26da6c
children 8f0c616d7425
line wrap: on
line diff
--- a/libmpdemux/stheader.h	Sat Aug 26 19:00:21 2006 +0000
+++ b/libmpdemux/stheader.h	Sat Aug 26 19:17:04 2006 +0000
@@ -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 @@
 } sh_audio_t;
 
 typedef struct {
+  int vid;
   demux_stream_t *ds;
   struct codecs_st *codec;
   unsigned int format;
@@ -89,8 +91,10 @@
 } 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);