RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename ambiguous "pts" variable to subpts. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29706 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-09-23 18:28:20 +00:00
parent de85aebe1e
commit 5c6d055a15
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mpcommon.c
View File

@ -147,8 +147,8 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset)
double endpts; double endpts;
vo_sub = &subs; vo_sub = &subs;
while (d_dvdsub->first) { while (d_dvdsub->first) {
double pts = ds_get_next_pts(d_dvdsub); double subpts = ds_get_next_pts(d_dvdsub);
if (pts > curpts) if (subpts > curpts)
break; break;
endpts = d_dvdsub->first->endpts; endpts = d_dvdsub->first->endpts;
len = ds_get_packet_sub(d_dvdsub, &packet); len = ds_get_packet_sub(d_dvdsub, &packet);
@ -164,15 +164,15 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset)
if (!ass_track) continue; if (!ass_track) continue;
if (type == 'a') { // ssa/ass subs with libass if (type == 'a') { // ssa/ass subs with libass
ass_process_chunk(ass_track, packet, len, ass_process_chunk(ass_track, packet, len,
(long long)(pts*1000 + 0.5), (long long)(subpts*1000 + 0.5),
(long long)((endpts-pts)*1000 + 0.5)); (long long)((endpts-subpts)*1000 + 0.5));
} else { // plaintext subs with libass } else { // plaintext subs with libass
vo_sub = NULL; vo_sub = NULL;
if (pts != MP_NOPTS_VALUE) { if (subpts != MP_NOPTS_VALUE) {
if (endpts == MP_NOPTS_VALUE) endpts = pts + 3; if (endpts == MP_NOPTS_VALUE) endpts = subpts + 3;
sub_clear_text(&subs, MP_NOPTS_VALUE); sub_clear_text(&subs, MP_NOPTS_VALUE);
sub_add_text(&subs, packet, len, endpts); sub_add_text(&subs, packet, len, endpts);
subs.start = pts * 100; subs.start = subpts * 100;
subs.end = endpts * 100; subs.end = endpts * 100;
ass_process_subtitle(ass_track, &subs); ass_process_subtitle(ass_track, &subs);
} }
@ -180,7 +180,7 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset)
continue; continue;
} }
#endif #endif
if (pts != MP_NOPTS_VALUE) { if (subpts != MP_NOPTS_VALUE) {
if (endpts == MP_NOPTS_VALUE) if (endpts == MP_NOPTS_VALUE)
sub_clear_text(&subs, MP_NOPTS_VALUE); sub_clear_text(&subs, MP_NOPTS_VALUE);
if (type == 'a') { // ssa/ass subs without libass => convert to plaintext if (type == 'a') { // ssa/ass subs without libass => convert to plaintext