diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-15 14:01:38 -0800 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2014-01-15 14:01:38 -0800 |
commit | cccadd245cbf9efed32e4fe5dad86110af28af43 (patch) | |
tree | 358dafa546b6e5904c31d1ff79511336424032e5 /vpxdec.c | |
parent | d39485a776bc94c897f4e9d6de8cb64f295c0e04 (diff) | |
download | libvpx-cccadd245cbf9efed32e4fe5dad86110af28af43.tar.gz libvpx-cccadd245cbf9efed32e4fe5dad86110af28af43.tar.bz2 libvpx-cccadd245cbf9efed32e4fe5dad86110af28af43.zip |
Removing VP8_FOURCC_MASK & VP9_FOURCC_MASK.
There is no reason to have fourcc masks, everything just works without
them.
Change-Id: I1d48100e7b7d5ef55ec49a708ba6adcb9ab4ecd8
Diffstat (limited to 'vpxdec.c')
-rw-r--r-- | vpxdec.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -40,13 +40,12 @@ static const struct { char const *name; const vpx_codec_iface_t *(*iface)(void); uint32_t fourcc; - uint32_t fourcc_mask; } ifaces[] = { #if CONFIG_VP8_DECODER - {"vp8", vpx_codec_vp8_dx, VP8_FOURCC_MASK, 0x00FFFFFF}, + {"vp8", vpx_codec_vp8_dx, VP8_FOURCC}, #endif #if CONFIG_VP9_DECODER - {"vp9", vpx_codec_vp9_dx, VP9_FOURCC_MASK, 0x00FFFFFF}, + {"vp9", vpx_codec_vp9_dx, VP9_FOURCC}, #endif }; @@ -670,7 +669,7 @@ int main_loop(int argc, const char **argv_) { /* Try to determine the codec from the fourcc. */ for (i = 0; i < sizeof(ifaces) / sizeof(ifaces[0]); i++) - if ((vpx_input_ctx.fourcc & ifaces[i].fourcc_mask) == ifaces[i].fourcc) { + if (vpx_input_ctx.fourcc == ifaces[i].fourcc) { vpx_codec_iface_t *vpx_iface = ifaces[i].iface(); if (iface && iface != vpx_iface) |