From cc48b5568ce6f557a417378deee7c8a960d08e69 Mon Sep 17 00:00:00 2001
From: jschlag <jschlag@google.com>
Date: Mon, 5 Mar 2018 08:54:42 -0800
Subject: [PATCH] handle errors from vpx_codec_control_ calls in vpx_jni

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=187872692
---
 extensions/vp9/src/main/jni/vpx_jni.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index 421b16d26d..12bc30112d 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -295,7 +295,11 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter) {
     return 0;
   }
   if (disableLoopFilter) {
-    vpx_codec_control_(context, VP9_SET_SKIP_LOOP_FILTER, true);
+    // TODO(b/71930387): Use vpx_codec_control(), not vpx_codec_control_().
+    err = vpx_codec_control_(context, VP9_SET_SKIP_LOOP_FILTER, true);
+    if (err) {
+      LOGE("ERROR: Failed to shut off libvpx loop filter, error = %d.", err);
+    }
   }
 
   // Populate JNI References.