[vlc-commits] videotoolbox: assure that the vout is configured before creating a pic

Thomas Guillem git at videolan.org
Mon Nov 21 17:33:36 CET 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Nov 21 17:27:44 2016 +0100| [29ecd6448abe923a10133af3e768672fc18d4e95] | committer: Jean-Baptiste Kempf

videotoolbox: assure that the vout is configured before creating a pic

This fixes a regression from 47467b9628e4776164164ab9c6caadf3b36c2408

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/videotoolbox.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index f105f39..92cd82f 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -1125,6 +1125,8 @@ skip:
 
         if (imageBuffer != NULL) {
             if (CVPixelBufferGetDataSize(imageBuffer) > 0) {
+                if (decoder_UpdateVideoFormat(p_dec) == NULL)
+                    return NULL;
                 p_pic = decoder_NewPicture(p_dec);
 
                 if (!p_pic)



More information about the vlc-commits mailing list