summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--media/filters/vp9_parser.cc5
2 files changed, 4 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 13f5455..dd1e03a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -526,6 +526,7 @@ Sathish Kuppuswamy <sathish.kuppuswamy@intel.com>
Satoshi Matsuzaki <satoshi.matsuzaki@gmail.com>
Sayan Nayak <sayan.nayak@samsung.com>
Scott Blomquist <sblom@microsoft.com>
+Scott D Phillips <scott.d.phillips@intel.com>
Sean Bryant <sean@cyberwang.net>
Seo Sanghyeon <sanxiyn@gmail.com>
Seokju Kwon <seokju.kwon@gmail.com>
diff --git a/media/filters/vp9_parser.cc b/media/filters/vp9_parser.cc
index d9319bf..dec3512 100644
--- a/media/filters/vp9_parser.cc
+++ b/media/filters/vp9_parser.cc
@@ -291,8 +291,9 @@ void Vp9Parser::ReadTiles(Vp9FrameHeader* fhdr) {
while (max_ones-- && reader_.ReadBool())
fhdr->log2_tile_cols++;
- if (reader_.ReadBool())
- fhdr->log2_tile_rows = reader_.ReadLiteral(2) - 1;
+ fhdr->log2_tile_rows = reader_.ReadBool() ? 1 : 0;
+ if (fhdr->log2_tile_rows > 0 && reader_.ReadBool())
+ fhdr->log2_tile_rows++;
}
bool Vp9Parser::ParseUncompressedHeader(const uint8_t* stream,