From 7690d88deb1841bb0fc0644d17aa43a5d03192cf Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Fri, 22 Aug 2014 18:01:28 -0700
Subject: [PATCH] vpxdec: fix --keep-going with --disable-vp8
the parsing of this flag was mistakenly put in a CONFIG_VP8_DECODER
conditional block in:
95853db vpxdec: add --keep-going option
Change-Id: Ie83ca0399fd3f3d4b0a9d03b7ca5536b310e1f02
---
vpxdec.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/vpxdec.c b/vpxdec.c
index 6c822abe78..6efbc5b680 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -599,7 +599,8 @@ int main_loop(int argc, const char **argv_) {
do_scale = 1;
else if (arg_match(&arg, &fb_arg, argi))
num_external_frame_buffers = arg_parse_uint(&arg);
-
+ else if (arg_match(&arg, &continuearg, argi))
+ keep_going = 1;
#if CONFIG_VP8_DECODER
else if (arg_match(&arg, &addnoise_level, argi)) {
postproc = 1;
@@ -649,11 +650,8 @@ int main_loop(int argc, const char **argv_) {
}
} else if (arg_match(&arg, &error_concealment, argi)) {
ec_enabled = 1;
- } else if (arg_match(&arg, &continuearg, argi)) {
- keep_going = 1;
}
-
-#endif
+#endif // CONFIG_VP8_DECODER
else
argj++;
}
--
GitLab