summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-10-09 11:57:23 -0700
committerMarco Nelissen <marcone@google.com>2015-10-16 20:23:10 +0000
commit66be90d7a0ec3c84a9ea30058c4878e2a8d7e48a (patch)
treeef0553d23e3bcff6fefb959f7993a0415e9d4e4f
parent7ba9f34a49f119a4448e874fec45c2bb14f87028 (diff)
downloadandroid_external_libavc-66be90d7a0ec3c84a9ea30058c4878e2a8d7e48a.tar.gz
android_external_libavc-66be90d7a0ec3c84a9ea30058c4878e2a8d7e48a.tar.bz2
android_external_libavc-66be90d7a0ec3c84a9ea30058c4878e2a8d7e48a.zip
Reconcile branch with master after mass cherrypicks
Change-Id: Ib017480389cb9f5204e5437716653016da348dba
-rw-r--r--decoder/ih264d_parse_headers.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c
index 1a96fdf..94ec8a8 100644
--- a/decoder/ih264d_parse_headers.c
+++ b/decoder/ih264d_parse_headers.c
@@ -903,10 +903,6 @@ WORD32 ih264d_parse_sps(dec_struct_t *ps_dec, dec_bit_stream_t *ps_bitstrm)
ps_dec->u2_disp_width = i4_cropped_wd;
}
- if(ps_dec->u4_level_at_init < u1_level_idc)
- {
- return IH264D_UNSUPPORTED_LEVEL;
- }
if(1 == ps_seq->u1_vui_parameters_present_flag)
{