vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Dec 26 17:41:24 2018 +0200| [95ee42d14e112b6c8cafc82c960e4977838b58c4] | committer: Rémi Denis-Courmont
vout: drop unnecessary pool check Pictures are now systematically copied into the correct display pool if necessary, so which pool the decoder allocates pictures from is irrelevant. Note though that this did not, and still does not, ensure that pictures are in the expected format. A buggy decoder could and still can send pictures in a wrong or old format. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=95ee42d14e112b6c8cafc82c960e4977838b58c4 --- src/video_output/video_output.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index d836a9a4ee..8c1350feb0 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -443,19 +443,8 @@ picture_t *vout_GetPicture(vout_thread_t *vout) void vout_PutPicture(vout_thread_t *vout, picture_t *picture) { picture->p_next = NULL; - if (picture_pool_OwnsPic(vout->p->decoder_pool, picture)) - { - picture_fifo_Push(vout->p->decoder_fifo, picture); - - vout_control_Wake(&vout->p->control); - } - else - { - /* FIXME: HACK: Drop this picture because the vout changed. The old - * picture pool need to be kept by the new vout. This requires a major - * "vout display" API change. */ - picture_Release(picture); - } + picture_fifo_Push(vout->p->decoder_fifo, picture); + vout_control_Wake(&vout->p->control); } /* */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
