Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours
am: 486e62c5dd  -s ours

Change-Id: I8f9016674ff88f70bc421604c1fae0bd208979d9