aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFei Wang <fei.w.wang@intel.com>2019-12-11 09:37:40 +0800
committerJames Almer <jamrial@gmail.com>2020-01-06 12:14:02 -0300
commitc96a52b7146244a0515b8bdd67fa3b6a0a143974 (patch)
treee7bdd2d448d3c66c88d2074a19409327d451bcca
parent3413eb6091d44386dea9e31fa56e34120766ec53 (diff)
downloadffmpeg-c96a52b7146244a0515b8bdd67fa3b6a0a143974.tar.gz
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)
-rw-r--r--libavcodec/cbs_av1.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index c680b34f17..8e962b8721 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -1072,6 +1072,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;