[vlc-commits] vout: keep the original picture if "early" SPU blending fails

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jun 22 21:21:47 2013 +0300| [26232fc00c2359df87792c3f05a3017b38c2ea79] | committer: Rémi Denis-Courmont

vout: keep the original picture if "early" SPU blending fails

This avoids loosing the picture context if there is one. If the
original picture has no context, it makes no difference whether the
original or the copy is kept since blending failed anyway.

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

 src/video_output/video_output.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 26eca24..c0401c1 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -975,8 +975,8 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
         if (blent) {
             VideoFormatCopyCropAr(&blent->format, &filtered->format);
             picture_Copy(blent, filtered);
-            if (vout->p->spu_blend) {
-                picture_BlendSubpicture(blent, vout->p->spu_blend, subpic);
+            if (vout->p->spu_blend
+             && picture_BlendSubpicture(blent, vout->p->spu_blend, subpic)) {
                 picture_Release(todisplay);
                 todisplay = blent;
             } else