vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Dec 26 17:39:37 2018 +0200| [dcfeca24ccbd561b7d2a85ca800b198a767abdc6] | committer: Rémi Denis-Courmont
vout: remove picture copy This is now taken care of by the display.c conversion code in a more generic fashion. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dcfeca24ccbd561b7d2a85ca800b198a767abdc6 --- src/video_output/video_output.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index facf41f717..61f6636585 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1147,25 +1147,6 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced) subpic = NULL; } - if (sys->display_pool != NULL) { - picture_t *direct = picture_pool_Get(sys->display_pool); - if (!direct) { - picture_Release(todisplay); - if (subpic) - subpicture_Delete(subpic); - return VLC_EGENERIC; - } - - /* The display uses direct rendering (no conversion), but its pool of - * pictures is not usable by the decoder (too few, too slow or - * subject to invalidation...). Since there are no filters, copying - * pictures from the decoder to the output is unavoidable. */ - video_format_CopyCropAr(&direct->format, &todisplay->format); - picture_Copy(direct, todisplay); - picture_Release(todisplay); - snap_pic = todisplay = direct; - } - /* * Take a snapshot if requested */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
