diff options
| author | Johann <johannkoenig@google.com> | 2015-04-15 09:27:00 -0400 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2015-04-15 11:12:05 -0400 |
| commit | 14ef4aeafbfc8730c8c324f26d68c2961447675f (patch) | |
| tree | 1a3a7617a99521cdbd7bac05cec9c200eacd549a /vp9 | |
| parent | d011a8a45cd6b1ef7b12ec53a5b0636f2e52e777 (diff) | |
| download | libvpx-14ef4aeafbfc8730c8c324f26d68c2961447675f.tar libvpx-14ef4aeafbfc8730c8c324f26d68c2961447675f.tar.gz libvpx-14ef4aeafbfc8730c8c324f26d68c2961447675f.tar.bz2 libvpx-14ef4aeafbfc8730c8c324f26d68c2961447675f.zip | |
Reorganize *_rtcd() calling conventions
Change-Id: Ib1e17d8aae9b713b87f560ab5e49952ee2bfdcc2
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_rtcd.c | 3 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decoder.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/vp9/common/vp9_rtcd.c b/vp9/common/vp9_rtcd.c index c777bc81f..2dfa09f50 100644 --- a/vp9/common/vp9_rtcd.c +++ b/vp9/common/vp9_rtcd.c @@ -12,10 +12,7 @@ #include "./vp9_rtcd.h" #include "vpx_ports/vpx_once.h" -void vpx_scale_rtcd(void); - void vp9_rtcd() { - vpx_scale_rtcd(); // TODO(JBB): Remove this once, by insuring that both the encoder and // decoder setup functions are protected by once(); once(setup_rtcd_internal); diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c index 358f22a8d..54802226b 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c @@ -12,6 +12,7 @@ #include <limits.h> #include <stdio.h> +#include "./vp9_rtcd.h" #include "./vpx_scale_rtcd.h" #include "vpx_mem/vpx_mem.h" @@ -39,6 +40,7 @@ static void initialize_dec(void) { if (!init_done) { vp9_rtcd(); + vpx_scale_rtcd(); vp9_init_intra_predictors(); init_done = 1; } diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 82f99b3e5..7c7723c32 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -13,6 +13,7 @@ #include <limits.h> #include "./vpx_config.h" +#include "./vp9_rtcd.h" #include "./vpx_scale_rtcd.h" #include "vpx/internal/vpx_psnr.h" #include "vpx_ports/vpx_timer.h" @@ -293,6 +294,7 @@ void vp9_initialize_enc(void) { if (!init_done) { vp9_rtcd(); + vpx_scale_rtcd(); vp9_init_intra_predictors(); vp9_init_me_luts(); vp9_rc_init_minq_luts(); |