Mercurial > mplayer.hg

comparison mpcommon.c @ 25857:4e593b5b4300

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reindent
author reimar
date Sun, 27 Jan 2008 16:38:04 +0000
parents d42e4a4942a4
children c585e2ad8ebf
comparison
equal deleted inserted replaced
25856:d42e4a4942a4 25857:4e593b5b4300
122 if (!ass_track) continue; 122 if (!ass_track) continue;
123 if (type == 'a') { // ssa/ass subs with libass 123 if (type == 'a') { // ssa/ass subs with libass
124 ass_process_chunk(ass_track, packet, len, 124 ass_process_chunk(ass_track, packet, len,
125 (long long)(pts*1000 + 0.5), 125 (long long)(pts*1000 + 0.5),
126 (long long)((endpts-pts)*1000 + 0.5)); 126 (long long)((endpts-pts)*1000 + 0.5));
127 } else { // plaintext subs with libass 127 } else { // plaintext subs with libass
128 vo_sub = NULL; 128 vo_sub = NULL;
129 if (pts != MP_NOPTS_VALUE) { 129 if (pts != MP_NOPTS_VALUE) {
130 if (endpts == MP_NOPTS_VALUE) endpts = pts + 3; 130 if (endpts == MP_NOPTS_VALUE) endpts = pts + 3;
131 sub_clear_text(&subs, MP_NOPTS_VALUE); 131 sub_clear_text(&subs, MP_NOPTS_VALUE);
132 sub_add_text(&subs, packet, len, endpts); 132 sub_add_text(&subs, packet, len, endpts);
133 subs.start = pts * 100; 133 subs.start = pts * 100;
134 subs.end = endpts * 100; 134 subs.end = endpts * 100;
135 ass_process_subtitle(ass_track, &subs); 135 ass_process_subtitle(ass_track, &subs);
136 }
136 } 137 }
137 }
138 continue; 138 continue;
139 } 139 }
140 #endif 140 #endif
141 if (pts != MP_NOPTS_VALUE) { 141 if (pts != MP_NOPTS_VALUE) {
142 if (endpts == MP_NOPTS_VALUE) 142 if (endpts == MP_NOPTS_VALUE)