Commit cd5a8fd2 authored by Laurent Aimar's avatar Laurent Aimar
Browse files

Fixed an invalid test when rendering subtitles.

parent ebced314
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment