diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-01-28 23:29:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 23:29:17 +0000 |
| commit | 2588b453fc170f0691d5c503dab2285fef6976c2 (patch) | |
| tree | 7d99a467add927d5aa74a1a8f7f75c8b13327251 | |
| parent | 0566949e25bdd541e969af0b5ce1aca405666d5a (diff) | |
| parent | 29e609a8c61b7c02d57495b71a4f82e7eb053dd6 (diff) | |
| download | frameworks_av-2588b453fc170f0691d5c503dab2285fef6976c2.zip frameworks_av-2588b453fc170f0691d5c503dab2285fef6976c2.tar.gz frameworks_av-2588b453fc170f0691d5c503dab2285fef6976c2.tar.bz2 | |
am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" into lmp-mr1-dev
* commit '29e609a8c61b7c02d57495b71a4f82e7eb053dd6':
stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ PV_STATUS DecodeVOLHeader(VideoDecData *video, int layer) { /* 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 && |