diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-07 18:02:49 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-07 18:02:49 +0000 |
| commit | 512eb68dc17b1b757846cb7915998bcaa86ed119 (patch) | |
| tree | 63a5aa3730c17a111b79deafd6798c7e1eacbd54 /libmpdemux | |
| parent | e5ab11ab5269be26b29b7abecc444f6b3a2a8e5e (diff) | |
| download | mpv-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
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 10 | ||||
| -rw-r--r-- | libmpdemux/demuxer.h | 10 | ||||
| -rw-r--r-- | libmpdemux/matroska.h | 10 |
3 files changed, 15 insertions, 15 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, |