Mercurial > mplayer.hg

changeset 30017:7119354805e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use on-stack subtitle struct for temporary storage for passing subtitles on for rendering by libass. This avoids mangling the static subtitle struct that is supposed to contain the subtitles that will actually be displayed and it also minimally reduces memory usage by freeing the subtitle lines again as early as possible.
author reimar
date Fri, 18 Dec 2009 19:29:33 +0000
parents 538fb3475fa7
children ae5d67d8ee95
files mpcommon.c
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mpcommon.c	Fri Dec 18 15:57:52 2009 +0000
+++ b/mpcommon.c	Fri Dec 18 19:29:33 2009 +0000
@@ -190,12 +190,13 @@
                                       (long long)((endpts-subpts)*1000 + 0.5));
                 } else { // plaintext subs with libass
                     if (subpts != MP_NOPTS_VALUE) {
+                        subtitle tmp_subs = {0};
                         if (endpts == MP_NOPTS_VALUE) endpts = subpts + 3;
-                        sub_clear_text(&subs, MP_NOPTS_VALUE);
-                        sub_add_text(&subs, packet, len, endpts);
-                        subs.start = subpts * 100;
-                        subs.end = endpts * 100;
-                        ass_process_subtitle(ass_track, &subs);
+                        sub_add_text(&tmp_subs, packet, len, endpts);
+                        tmp_subs.start = subpts * 100;
+                        tmp_subs.end = endpts * 100;
+                        ass_process_subtitle(ass_track, &tmp_subs);
+                        sub_clear_text(&tmp_subs, MP_NOPTS_VALUE);
                     }
                 }
                 continue;