commit 8d10f8ea7b06e47173ab9e6062a39ea58a694f3f
author Ronghua Wu <ronghuawu@google.com> Wed Jan 28 15:04:28 2015 -0800
committer The Android Automerger <android-build@google.com> Wed Jan 28 15:27:44 2015 -0800
tree 3692ba7cd5206ae7cf00899155535b9531ed47e1
parent a6bd4496d4eea4f866111db198a48f24895eee98

stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder

Bug:19013118
Change-Id: I58f63ae13559c93ea5e627b658c9919e86769076

media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
index 8e8e78a..60c79a6 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
@@ -118,10 +118,10 @@
         {
             /* support SPL0-3 & SSPL0-2   */
             if (tmpvar != 0x01 && tmpvar != 0x02 && tmpvar != 0x03 && tmpvar != 0x08 &&
-                    /* While not technically supported, try to decode SPL4 files as well. */
+                    /* While not technically supported, try to decode SPL4&SPL5 files as well. */
                     /* We'll fail later if the size is too large.  This is to allow playback of */
                     /* some <=CIF files generated by other encoders. */
-                    tmpvar != 0x04 &&
+                    tmpvar != 0x04 && tmpvar != 0x05 &&
                     tmpvar != 0x10 && tmpvar != 0x11 && tmpvar != 0x12 &&
                     tmpvar != 0x21 && tmpvar != 0x22 &&  /* Core Profile Levels */
                     tmpvar != 0xA1 && tmpvar != 0xA2 && tmpvar != 0xA3 &&