[vlc-commits] mmal/converter: fix compilation

Steve Lhomme git at videolan.org
Wed Oct 7 11:17:28 CEST 2020


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Oct  7 11:16:33 2020 +0200| [332ea96657831e2f96a3d3324afe3511d8c90805] | committer: Steve Lhomme

mmal/converter: fix compilation

Bug introduced in 745b8d13f626e52a4ea4cf37631216fbffab455b when switching to
vlc_picture_chain_t.

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

 modules/hw/mmal/converter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hw/mmal/converter.c b/modules/hw/mmal/converter.c
index 892cace469..0c2a4c15de 100644
--- a/modules/hw/mmal/converter.c
+++ b/modules/hw/mmal/converter.c
@@ -318,7 +318,7 @@ static void slice_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buf)
     if (buf->data != NULL && buf->length != 0)
     {
         // Got slice
-        picture_t *pic = sys->slice.pics.head;
+        picture_t *pic = vlc_picture_chain_PeekFront( &sys->slice.pics );
         const unsigned int scale_lines = sys->output->format->es->video.height;  // Expected lines of callback
 
         if (pic == NULL) {
@@ -366,7 +366,7 @@ static void slice_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buf)
                 sys->slice.line = 0;
 
                 vlc_mutex_lock(&sys->lock);
-                pic_fifo_get(&sys->slice.pics);  // Remove head from Q
+                pic = pic_fifo_get(&sys->slice.pics);  // Remove head from Q
                 vlc_mutex_unlock(&sys->lock);
 
                 buf_to_pic_copy_props(pic, buf);



More information about the vlc-commits mailing list