summaryrefslogtreecommitdiffstats
path: root/mplayer.c
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 /mplayer.c
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
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c8
1 files changed, 4 insertions, 4 deletions
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,