From 69abae318a7e557fc39723a2baa07fa4c6d77b45 Mon Sep 17 00:00:00 2001
From: Fei Wang <fei.w.wang@intel.com>
Date: Wed, 11 Dec 2019 09:37:40 +0800
Subject: [PATCH] avcodec/cbs_av1: avoid reading trailing bits when obu type is
 OBU_TILE_LIST

Signed-off-by: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 1ea44178f5fff7eb600026a09a0ce7d477ed0240)
---
 libavcodec/cbs_av1.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index 533a4ffa16..cf3561a4ea 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -1040,6 +1040,7 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx,
 
     if (obu->obu_size > 0 &&
         obu->header.obu_type != AV1_OBU_TILE_GROUP &&
+        obu->header.obu_type != AV1_OBU_TILE_LIST &&
         obu->header.obu_type != AV1_OBU_FRAME) {
         int nb_bits = obu->obu_size * 8 + start_pos - end_pos;