mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2006-07-07 18:02:49 +00:00
parent e5ab11ab52
commit 512eb68dc1
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libmpdemux/demux_mkv.c
View File

@ -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;
}

10
libmpdemux/demuxer.h
View File

@ -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

10
libmpdemux/matroska.h
View File

@ -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,

8
mplayer.c
View File

@ -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,