commit fb71f98165785d28ddc6f0ea3858847f00fd3015
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Wed Jul 25 12:46:32 2018 -0700
committer James Zern <jzern@google.com> Thu Jul 26 12:07:18 2018 -0700
tree efef097807ba7a7de551dde2c892087a8618046f
parent 16c80212bdcb44302d48d791b78508f52dd8cb33

vpxdec: only call row-mt control for vp9

BUG=webm:1549
Change-Id: Ib31b22f0d982e3a7c6a200274582cda7528d1ec9

vpxdec.c

diff --git a/vpxdec.c b/vpxdec.c
index 26c4752..522eda1 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -99,7 +99,7 @@
 static const arg_def_t framestatsarg =
     ARG_DEF(NULL, "framestats", 1, "Output per-frame stats (.csv format)");
 static const arg_def_t rowmtarg =
-    ARG_DEF(NULL, "row-mt", 1, "Enable multi-threading to run row-wise");
+    ARG_DEF(NULL, "row-mt", 1, "Enable multi-threading to run row-wise in VP9");
 
 static const arg_def_t *all_args[] = {
   &help,           &codecarg,      &use_yv12,         &use_i420,
@@ -758,7 +758,8 @@
       goto fail;
     }
   }
-  if (vpx_codec_control(&decoder, VP9D_SET_ROW_MT, enable_row_mt)) {
+  if (interface->fourcc == VP9_FOURCC &&
+      vpx_codec_control(&decoder, VP9D_SET_ROW_MT, enable_row_mt)) {
     fprintf(stderr, "Failed to set decoder in row multi-thread mode: %s\n",
             vpx_codec_error(&decoder));
     goto fail;