summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gui/mplayer/play.h4
-rw-r--r--libmpdemux/stream.h11
2 files changed, 5 insertions, 10 deletions
diff --git a/Gui/mplayer/play.h b/Gui/mplayer/play.h
index 07e72019a2..20ed0cb4ca 100644
--- a/Gui/mplayer/play.h
+++ b/Gui/mplayer/play.h
@@ -44,9 +44,9 @@ typedef struct
int current_title;
int current_angle;
int nr_of_audio_channels;
- audio_stream_t audio_streams[8];
+ stream_language_t audio_streams[32];
int nr_of_subtitles;
- subtitle_t subtitles[32];
+ stream_language_t subtitles[32];
} mplDVDStruct;
#endif
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h
index f6734561cf..f10dbab862 100644
--- a/libmpdemux/stream.h
+++ b/libmpdemux/stream.h
@@ -177,12 +177,7 @@ extern int dvd_angle;
typedef struct {
int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm
int language;
-} audio_stream_t;
-
-typedef struct {
- int id; // 0 - 31
- int language;
-} subtitle_t;
+} stream_language_t;
typedef struct {
dvd_reader_t *dvd;
@@ -202,10 +197,10 @@ typedef struct {
int angle_seek;
// audio datas
int nr_of_channels;
- audio_stream_t audio_streams[8];
+ stream_language_t audio_streams[32];
// subtitles
int nr_of_subtitles;
- subtitle_t subtitles[32];
+ stream_language_t subtitles[32];
} dvd_priv_t;
#endif