Merge "Separates profile 2 into 2 profiles 2 and 3"

diff --cc test/invalid_file_test.cc
Simple merge

diff --cc test/test-data.sha1
index 362d485,aefa8a4..74f7842
--- 1/test/test-data.sha1
--- 2/test/test-data.sha1
+++ b/test/test-data.sha1
@@@ -657,21 -663,5 +665,7 @@@ e3ab35d4316c5e81325c50f5236ceca4bc0d35d
  8f46ba5f785d0c2170591a153e0d0d146a7c8090  vp90-2-15-segkey_adpq.webm.md5
  698a6910a97486b833073ef0c0b18d75dce57ee8  vp90-2-16-intra-only.webm
  5661b0168752969f055eec37b05fa9fa947dc7eb  vp90-2-16-intra-only.webm.md5
 +c01bb7938f9a9f25e0c37afdec2f2fb73b6cc7fa  vp90-2-17-show-existing-frame.webm
 +cc75f351818b9a619818f5cc77b9bc013d0c1e11  vp90-2-17-show-existing-frame.webm.md5
  0321d507ce62dedc8a51b4e9011f7a19aed9c3dc  vp91-2-04-yuv444.webm
  367e423dd41fdb49aa028574a2cfec5c2f325c5c  vp91-2-04-yuv444.webm.md5
- 76024eb753cdac6a5e5703aaea189d35c3c30ac7  invalid-vp90-2-00-quantizer-00.webm.ivf.s5861_r01-05_b6-.ivf
- d3964f9dad9f60363c81b688324d95b4ec7c8038  invalid-vp90-2-00-quantizer-00.webm.ivf.s5861_r01-05_b6-.ivf.res
- 83f50908c8dc0ef8760595447a2ff7727489542e  invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-.ivf
- 456d1493e52d32a5c30edf44a27debc1fa6b253a  invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-.ivf.res
- c123d1f9f02fb4143abb5e271916e3a3080de8f6  invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-z.ivf
- 456d1493e52d32a5c30edf44a27debc1fa6b253a  invalid-vp90-2-00-quantizer-11.webm.ivf.s52984_r01-05_b6-z.ivf.res
- fe346136b9b8c1e6f6084cc106485706915795e4  invalid-vp90-01-v2.webm
- 25751f5d3b05ff03f0719ad42cd625348eb8961e  invalid-vp90-01-v2.webm.res
- d78e2fceba5ac942246503ec8366f879c4775ca5  invalid-vp90-02-v2.webm
- 8e2eff4af87d2b561cce2365713269e301457ef3  invalid-vp90-02-v2.webm.res
- df1a1453feb3c00d7d89746c7003b4163523bff3  invalid-vp90-03-v2.webm
- 25dd58c22d23f75304d7ce7f69f4e5b02ef9119a  invalid-vp90-03-v2.webm.res
- d637297561dd904eb2c97a9015deeb31c4a1e8d2  invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm
- 3a204bdbeaa3c6458b77bcebb8366d107267f55d  invalid-vp90-2-08-tile_1x4_frame_parallel_all_key.webm.res

diff --cc test/test.mk
Simple merge

diff --cc vp9/decoder/vp9_decodeframe.c
Simple merge