[vlc-commits] Fixed an invalid test when rendering subtitles.

[Laurent Aimar]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Feb 12 20:52:34 2011 +0100| [cd5a8fd2616f193f42e80bf1f5d86f5085ced849] | committer: Laurent Aimar

Fixed an invalid test when rendering subtitles.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cd5a8fd2616f193f42e80bf1f5d86f5085ced849
---

 src/video_output/video_output.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 9c74e13..34a259d 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -959,7 +959,7 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
     bool is_direct;
     picture_t *todisplay;
 
-    if (filtered && do_early_spu && vout->p->spu_blend && subpic) {
+    if (filtered && do_early_spu && subpic) {
         if (vd->info.is_slow) {
             is_direct = false;
             todisplay = picture_NewFromFormat(&vd->source); /* FIXME a pool ? */
@@ -970,7 +970,8 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
         if (todisplay) {
             VideoFormatCopyCropAr(&todisplay->format, &filtered->format);
             picture_Copy(todisplay, filtered);
-            picture_BlendSubpicture(todisplay, vout->p->spu_blend, subpic);
+            if (vout->p->spu_blend)
+                picture_BlendSubpicture(todisplay, vout->p->spu_blend, subpic);
         }
         picture_Release(filtered);
         subpicture_Delete(subpic);