[automerger] Adding Check For Number of Skip MBs am: 414cd5db73 am: 5da13fdeb2 am: 7b162d4405 am: c03b3f3f0c am: 7dd36bd482 am: 46ab28d876 am: cae5c0be2d am: 27cd5e4b15 am: d24451b7ef am: 8abe536118 am: e9d732e3e5
am: 0544a6bbcb

Change-Id: I266790e56e2e82447903d1b9ea4d0c7f1f0a3539

Android.bp

diff --git a/Android.bp b/Android.bp
index 2eff420..c5487c3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,7 +65,7 @@
                 "common/arm/ideint_function_selector.c",
             ],
 
-            armv7_a_neon: {
+            neon: {
                 srcs: [
                     "decoder/arm/impeg2d_function_selector_a9q.c",
                     "common/arm/ideint_function_selector_a9.c",

decoder/impeg2d_dec_hdr.c

diff --git a/decoder/impeg2d_dec_hdr.c b/decoder/impeg2d_dec_hdr.c
index c16bfe2..e899347 100644
--- a/decoder/impeg2d_dec_hdr.c
+++ b/decoder/impeg2d_dec_hdr.c
@@ -1875,7 +1875,11 @@
                     return e_error;
                 }
                 impeg2d_flush_ext_and_user_data(ps_dec);
-                impeg2d_pre_pic_dec_proc(ps_dec);
+                e_error = impeg2d_pre_pic_dec_proc(ps_dec);
+                if ((IMPEG2D_ERROR_CODES_T)IVD_ERROR_NONE != e_error)
+                {
+                    return e_error;
+                }
                 impeg2d_dec_pic_data(ps_dec);
                 impeg2d_post_pic_dec_proc(ps_dec);
                 u4_start_code_found = 1;

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index d1cbc2b..f17489e 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -6,6 +6,8 @@
         "-DMD5_DISABLE",
         "-DARM",
         "-fPIC",
+        "-Wall",
+        "-Werror",
     ],
     local_include_dirs: [
         "decoder/",