[MPlayer-cvslog] r30059 - trunk/mpcommon.c

[reimar]

Author: reimar
Date: Fri Dec 18 20:29:33 2009
New Revision: 30059

Log:
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.

Modified:
   trunk/mpcommon.c

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Fri Dec 18 16:57:52 2009	(r30058)
+++ trunk/mpcommon.c	Fri Dec 18 20:29:33 2009	(r30059)
@@ -190,12 +190,13 @@ void update_subtitles(sh_video_t *sh_vid
                                       (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;