summaryrefslogtreecommitdiffstats
path: root/mpcommon.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-23 18:28:20 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-09-23 18:28:20 +0000
commit5c6d055a15fdeb48315b8eeea0ee51d3301d01e8 (patch)
tree9485c333daf08ad5467b33038b0336ed1a7e05a2 /mpcommon.c
parentde85aebe1ec10c85f064805e7e630301adb89775 (diff)
downloadmpv-5c6d055a15fdeb48315b8eeea0ee51d3301d01e8.tar.bz2
mpv-5c6d055a15fdeb48315b8eeea0ee51d3301d01e8.tar.xz
Rename ambiguous "pts" variable to subpts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29706 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mpcommon.c')
-rw-r--r--mpcommon.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/mpcommon.c b/mpcommon.c
index ba738dcee4..bbdfd32b7a 100644
--- a/mpcommon.c
+++ b/mpcommon.c
@@ -147,8 +147,8 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset)
double endpts;
vo_sub = &subs;
while (d_dvdsub->first) {
- double pts = ds_get_next_pts(d_dvdsub);
- if (pts > curpts)
+ double subpts = ds_get_next_pts(d_dvdsub);
+ if (subpts > curpts)
break;
endpts = d_dvdsub->first->endpts;
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 (type == 'a') { // ssa/ass subs with libass
ass_process_chunk(ass_track, packet, len,
- (long long)(pts*1000 + 0.5),
- (long long)((endpts-pts)*1000 + 0.5));
+ (long long)(subpts*1000 + 0.5),
+ (long long)((endpts-subpts)*1000 + 0.5));
} else { // plaintext subs with libass
vo_sub = NULL;
- if (pts != MP_NOPTS_VALUE) {
- if (endpts == MP_NOPTS_VALUE) endpts = pts + 3;
+ if (subpts != MP_NOPTS_VALUE) {
+ if (endpts == MP_NOPTS_VALUE) endpts = subpts + 3;
sub_clear_text(&subs, MP_NOPTS_VALUE);
sub_add_text(&subs, packet, len, endpts);
- subs.start = pts * 100;
+ subs.start = subpts * 100;
subs.end = endpts * 100;
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;
}
#endif
- if (pts != MP_NOPTS_VALUE) {
+ if (subpts != MP_NOPTS_VALUE) {
if (endpts == MP_NOPTS_VALUE)
sub_clear_text(&subs, MP_NOPTS_VALUE);
if (type == 'a') { // ssa/ass subs without libass => convert to plaintext