diff options
| author | Alex Converse <aconverse@google.com> | 2014-07-17 11:29:59 -0700 |
|---|---|---|
| committer | Alex Converse <aconverse@google.com> | 2014-07-21 15:55:50 -0700 |
| commit | 5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee (patch) | |
| tree | 2dfea1d154dfdbf4eb21054d37cff459b0afa5e1 /vp9/decoder/vp9_decodeframe.c | |
| parent | 765485cab21021ac4ba9d1cbddce2432f421de99 (diff) | |
| download | libvpx-5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee.tar libvpx-5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee.tar.gz libvpx-5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee.tar.bz2 libvpx-5926e7c0e8b3822e50b0a85ff7d59bc75b7ac4ee.zip | |
Remove unfinished VP9 alpha channel.
Change-Id: Ic5d3a3a0dac10b49495771886a31e793bb78b5ca
Diffstat (limited to 'vp9/decoder/vp9_decodeframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 15c8410f5..28c674a38 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1134,14 +1134,18 @@ static size_t read_uncompressed_header(VP9Decoder *pbi, if (cm->profile == PROFILE_1 || cm->profile == PROFILE_3) { cm->subsampling_x = vp9_rb_read_bit(rb); cm->subsampling_y = vp9_rb_read_bit(rb); - vp9_rb_read_bit(rb); // has extra plane + if (vp9_rb_read_bit(rb)) + vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, + "Reserved bit set"); } else { cm->subsampling_y = cm->subsampling_x = 1; } } else { if (cm->profile == PROFILE_1 || cm->profile == PROFILE_3) { cm->subsampling_y = cm->subsampling_x = 0; - vp9_rb_read_bit(rb); // has extra plane + if (vp9_rb_read_bit(rb)) + vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, + "Reserved bit set"); } else { vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, "4:4:4 color not supported in profile 0"); |