[vlc-commits] access: bluray: check region chromas

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Mar  6 17:51:53 2020 +0100| [aadcb32cf141778e767208c9d316ced6134d81ee] | committer: Francois Cartegnie

access: bluray: check region chromas

(cherry picked from commit 72ba342fe889d1c545f8af2695c3d51222e9ca08)

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

 modules/access/bluray.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 9a578b5d3f..5cb0524a9d 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -1751,8 +1751,11 @@ static void blurayDrawOverlay(demux_t *p_demux, const BD_OVERLAY* const eventov)
     subpicture_region_t *p_last = NULL;
     while (p_reg != NULL) {
         p_last = p_reg;
-        if (p_reg->i_x == eventov->x && p_reg->i_y == eventov->y &&
-                p_reg->fmt.i_width == eventov->w && p_reg->fmt.i_height == eventov->h)
+        if (p_reg->i_x == eventov->x &&
+            p_reg->i_y == eventov->y &&
+            p_reg->fmt.i_width == eventov->w &&
+            p_reg->fmt.i_height == eventov->h &&
+            p_reg->fmt.i_chroma == VLC_CODEC_YUVP)
             break;
         pp_reg = &p_reg->p_next;
         p_reg = p_reg->p_next;
@@ -1889,7 +1892,7 @@ static void blurayDrawArgbOverlay(demux_t *p_demux, const BD_ARGB_OVERLAY* const
 
     /* Find a region to update */
     subpicture_region_t *p_reg = ov->p_regions;
-    if (!p_reg) {
+    if (!p_reg || p_reg->fmt.i_chroma != VLC_CODEC_RGBA) {
         vlc_mutex_unlock(&ov->lock);
         return;
     }