Commit 971ddef7 authored by Laurent Aimar's avatar Laurent Aimar

Updated after direct rendering support in vout_FilterDisplay.

parent 654d8a72
...@@ -416,21 +416,15 @@ static void Render(vout_thread_t *vout, picture_t *picture) ...@@ -416,21 +416,15 @@ static void Render(vout_thread_t *vout, picture_t *picture)
vout_display_t *vd = sys->vd; vout_display_t *vd = sys->vd;
assert(sys->use_dr || !picture->p_sys->direct); assert(sys->use_dr || !picture->p_sys->direct);
assert(vout_IsDisplayFiltered(vd) == !sys->use_dr);
if (sys->use_dr) { if (sys->use_dr) {
assert(!vout_IsDisplayFiltered(vd));
assert(picture->p_sys->direct); assert(picture->p_sys->direct);
vout_display_Prepare(vd, picture->p_sys->direct); vout_display_Prepare(vd, picture->p_sys->direct);
} else { } else {
picture_t *filtered = vout_FilterDisplay(vd, picture); picture_t *direct = picture->p_sys->direct = vout_FilterDisplay(vd, picture);
if (filtered) { if (direct) {
picture_t *direct = picture->p_sys->direct = vout_display_Get(vd); vout_display_Prepare(vd, direct);
if (direct) {
picture_Copy(direct, filtered);
vout_display_Prepare(vd, direct);
}
picture_Release(filtered);
} }
} }
} }
......
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