diff options
author | Deb Mukherjee <debargha@google.com> | 2014-07-15 16:55:12 -0700 |
---|---|---|
committer | Deb Mukherjee <debargha@google.com> | 2014-07-15 16:55:12 -0700 |
commit | f332c6305ec55fb2bc98198721696fcf0283b0ae (patch) | |
tree | 070a4f23d0832effc3c21fd87cc5f01fcf9c5df9 /vpxdec.c | |
parent | f349b071c6d5e806552c261ba13bd99bb5f7c6ce (diff) | |
download | libvpx-f332c6305ec55fb2bc98198721696fcf0283b0ae.tar libvpx-f332c6305ec55fb2bc98198721696fcf0283b0ae.tar.gz libvpx-f332c6305ec55fb2bc98198721696fcf0283b0ae.tar.bz2 libvpx-f332c6305ec55fb2bc98198721696fcf0283b0ae.zip |
Renames interface field in VpxInterface
Renames interface to codec_interface since it is a reserved
word on windows.
Change-Id: I84f2cbf257a4c44f16dc2464127e35ee405c2c3e
Diffstat (limited to 'vpxdec.c')
-rw-r--r-- | vpxdec.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -166,7 +166,7 @@ void usage_exit() { for (i = 0; i < get_vpx_decoder_count(); ++i) { const VpxInterface *const decoder = get_vpx_decoder_by_index(i); fprintf(stderr, " %-6s - %s\n", - decoder->name, vpx_codec_iface_name(decoder->interface())); + decoder->name, vpx_codec_iface_name(decoder->codec_interface())); } exit(EXIT_FAILURE); @@ -286,7 +286,7 @@ int file_is_raw(struct VpxInputContext *input) { if (mem_get_le32(buf) < 256 * 1024 * 1024) { for (i = 0; i < get_vpx_decoder_count(); ++i) { const VpxInterface *const decoder = get_vpx_decoder_by_index(i); - if (!vpx_codec_peek_stream_info(decoder->interface(), + if (!vpx_codec_peek_stream_info(decoder->codec_interface(), buf + 4, 32 - 4, &si)) { is_raw = 1; input->fourcc = decoder->fourcc; @@ -728,7 +728,8 @@ int main_loop(int argc, const char **argv_) { dec_flags = (postproc ? VPX_CODEC_USE_POSTPROC : 0) | (ec_enabled ? VPX_CODEC_USE_ERROR_CONCEALMENT : 0); - if (vpx_codec_dec_init(&decoder, interface->interface(), &cfg, dec_flags)) { + if (vpx_codec_dec_init(&decoder, interface->codec_interface(), + &cfg, dec_flags)) { fprintf(stderr, "Failed to initialize decoder: %s\n", vpx_codec_error(&decoder)); return EXIT_FAILURE; |