summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-22 19:22:53 +0200
committerwm4 <wm4@nowhere>2013-06-22 19:25:04 +0200
commit68b0694f09f86e632de55f5d61d52c08f8533372 (patch)
treea6b605bca525a66605d88c8d562c3a4d9bcd28d8
parent8d555a1d7463bcb18a561dafbeabd297e7b721b8 (diff)
downloadlibass-68b0694f09f86e632de55f5d61d52c08f8533372.tar.bz2
libass-68b0694f09f86e632de55f5d61d52c08f8533372.tar.xz
Allow different ASS_Library for ASS_Track and ASS_Renderer
Remove the explicit check whether the ASS_Track and ASS_Renderer were created from the same ASS_Library object. Logging will not be entirely consistent (some log messages go to the ASS_Track library when rendering), but otherwise it works. ASS_Library also contains embedded fonts added with ass_add_font(). It looks like the renderer will use the fonts from the ASS_Renderer library object.
-rw-r--r--libass/ass_render.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c
index 1923b3a..b517dd0 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -2228,9 +2228,6 @@ ass_start_frame(ASS_Renderer *render_priv, ASS_Track *track,
&& !render_priv->settings.frame_height)
return 1; // library not initialized
- if (render_priv->library != track->library)
- return 1;
-
if (!render_priv->fontconfig_priv)
return 1;