summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-07 18:02:49 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-07 18:02:49 +0000
commit512eb68dc17b1b757846cb7915998bcaa86ed119 (patch)
tree63a5aa3730c17a111b79deafd6798c7e1eacbd54
parente5ab11ab5269be26b29b7abecc444f6b3a2a8e5e (diff)
downloadmpv-512eb68dc17b1b757846cb7915998bcaa86ed119.tar.bz2
mpv-512eb68dc17b1b757846cb7915998bcaa86ed119.tar.xz
Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_mkv.c10
-rw-r--r--libmpdemux/demuxer.h10
-rw-r--r--libmpdemux/matroska.h10
-rw-r--r--mplayer.c8
4 files changed, 19 insertions, 19 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 14fbf2efeb..d0d2b59b4a 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -129,7 +129,7 @@ typedef struct mkv_track
int num_encodings;
/* For VobSubs */
- mkv_sh_sub_t sh_sub;
+ sh_sub_t sh_sub;
} mkv_track_t;
typedef struct mkv_index
@@ -2124,9 +2124,9 @@ demux_mkv_open_sub (demuxer_t *demuxer, mkv_track_t *track)
{
if (track->private_data != NULL)
{
- demuxer->sub->sh = malloc(sizeof(mkv_sh_sub_t));
+ demuxer->sub->sh = malloc(sizeof(sh_sub_t));
if (demuxer->sub->sh != NULL)
- memcpy(demuxer->sub->sh, &track->sh_sub, sizeof(mkv_sh_sub_t));
+ memcpy(demuxer->sub->sh, &track->sh_sub, sizeof(sh_sub_t));
}
}
}
@@ -3571,9 +3571,9 @@ demux_mkv_change_subs (demuxer_t *demuxer, int new_num)
return -1;
if (demuxer->sub->sh == NULL)
- demuxer->sub->sh = malloc(sizeof(mkv_sh_sub_t));
+ demuxer->sub->sh = malloc(sizeof(sh_sub_t));
if (demuxer->sub->sh != NULL)
- memcpy(demuxer->sub->sh, &track->sh_sub, sizeof(mkv_sh_sub_t));
+ memcpy(demuxer->sub->sh, &track->sh_sub, sizeof(sh_sub_t));
return track->tnum;
}
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 93b43721c4..46642a51a1 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -121,6 +121,16 @@ typedef struct demuxer_info_st {
char *copyright;
} demuxer_info_t;
+typedef struct {
+ char type; // t = text, v = VobSub
+ int has_palette; // If we have a valid palette
+ unsigned int palette[16]; // for VobSubs
+ int width, height; // for VobSubs
+ int custom_colors;
+ unsigned int colors[4];
+ int forced_subs_only;
+} sh_sub_t;
+
#define MAX_A_STREAMS 256
#define MAX_V_STREAMS 256
diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h
index fa55645b5d..b416e4f7ac 100644
--- a/libmpdemux/matroska.h
+++ b/libmpdemux/matroska.h
@@ -58,16 +58,6 @@
#define MKV_S_SSA "S_SSA" // Deprecated
#define MKV_S_ASS "S_ASS" // Deprecated
-typedef struct {
- char type; // t = text, v = VobSub
- int has_palette; // If we have a valid palette
- unsigned int palette[16]; // for VobSubs
- int width, height; // for VobSubs
- int custom_colors;
- unsigned int colors[4];
- int forced_subs_only;
-} mkv_sh_sub_t;
-
int demux_mkv_num_subs(demuxer_t *demuxer);
int demux_mkv_change_subs(demuxer_t *demuxer, int new_num);
void demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang,
diff --git a/mplayer.c b/mplayer.c
index d39d49c934..6b48986cc6 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1947,8 +1947,8 @@ static int mp_property_sub(m_option_t* prop,int action,void* arg) {
if (demuxer->type == DEMUXER_TYPE_MATROSKA) {
d_dvdsub->id = demux_mkv_change_subs(demuxer, dvdsub_id);
if (d_dvdsub->id >= 0 &&
- ((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v') {
- mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh;
+ ((sh_sub_t *)d_dvdsub->sh)->type == 'v') {
+ sh_sub_t *mkv_sh_sub = (sh_sub_t *)d_dvdsub->sh;
if (vo_spudec != NULL)
spudec_free(vo_spudec);
vo_spudec =
@@ -3405,8 +3405,8 @@ if (vo_spudec==NULL && stream->type==STREAMTYPE_DVD) {
#endif
if ((vo_spudec == NULL) && (demuxer->type == DEMUXER_TYPE_MATROSKA) &&
- (d_dvdsub->sh != NULL) && (((mkv_sh_sub_t *)d_dvdsub->sh)->type == 'v')) {
- mkv_sh_sub_t *mkv_sh_sub = (mkv_sh_sub_t *)d_dvdsub->sh;
+ (d_dvdsub->sh != NULL) && (((sh_sub_t *)d_dvdsub->sh)->type == 'v')) {
+ sh_sub_t *mkv_sh_sub = (sh_sub_t *)d_dvdsub->sh;
current_module = "spudec_init_matroska";
vo_spudec =
spudec_new_scaled_vobsub(mkv_sh_sub->palette, mkv_sh_sub->colors,