diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:00 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:03 -0500 |
| commit | d2499ead93dc4298c0882fe98902acb1b5209f99 (patch) | |
| tree | cb0b942aed59e5108f9a3e9d64e7b77854383421 /third_party/aom/test/codec_factory.h | |
| parent | 41fbdea457bf50c0a43e1c27c5cbf7f0a3a9eb33 (diff) | |
| download | UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.gz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.lz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.xz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.zip | |
Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591
Diffstat (limited to 'third_party/aom/test/codec_factory.h')
| -rw-r--r-- | third_party/aom/test/codec_factory.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/third_party/aom/test/codec_factory.h b/third_party/aom/test/codec_factory.h index e6ae7f8c3..dd99110ee 100644 --- a/third_party/aom/test/codec_factory.h +++ b/third_party/aom/test/codec_factory.h @@ -8,8 +8,8 @@ * Media Patent License 1.0 was not distributed with this source code in the * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef TEST_CODEC_FACTORY_H_ -#define TEST_CODEC_FACTORY_H_ +#ifndef AOM_TEST_CODEC_FACTORY_H_ +#define AOM_TEST_CODEC_FACTORY_H_ #include "config/aom_config.h" @@ -89,7 +89,7 @@ class AV1Decoder : public Decoder { protected: virtual aom_codec_iface_t *CodecInterface() const { #if CONFIG_AV1_DECODER - return &aom_codec_av1_dx_algo; + return aom_codec_av1_dx(); #else return NULL; #endif @@ -105,7 +105,7 @@ class AV1Encoder : public Encoder { protected: virtual aom_codec_iface_t *CodecInterface() const { #if CONFIG_AV1_ENCODER - return &aom_codec_av1_cx_algo; + return aom_codec_av1_cx(); #else return NULL; #endif @@ -147,7 +147,7 @@ class AV1CodecFactory : public CodecFactory { virtual aom_codec_err_t DefaultEncoderConfig(aom_codec_enc_cfg_t *cfg, int usage) const { #if CONFIG_AV1_ENCODER - return aom_codec_enc_config_default(&aom_codec_av1_cx_algo, cfg, usage); + return aom_codec_enc_config_default(aom_codec_av1_cx(), cfg, usage); #else (void)cfg; (void)usage; @@ -167,4 +167,4 @@ const libaom_test::AV1CodecFactory kAV1; __VA_ARGS__)) } // namespace libaom_test -#endif // TEST_CODEC_FACTORY_H_ +#endif // AOM_TEST_CODEC_FACTORY_H_ |