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 /vp8 | |
| parent | d011a8a45cd6b1ef7b12ec53a5b0636f2e52e777 (diff) | |
| download | libvpx-14ef4aeafbfc8730c8c324f26d68c2961447675f.tar.gz | |
Reorganize *_rtcd() calling conventions
Change-Id: Ib1e17d8aae9b713b87f560ab5e49952ee2bfdcc2
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/rtcd.c | 6 | ||||
| -rw-r--r-- | vp8/vp8_cx_iface.c | 4 | ||||
| -rw-r--r-- | vp8/vp8_dx_iface.c | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/vp8/common/rtcd.c b/vp8/common/rtcd.c index 0b371b094..ab0e9b47f 100644 --- a/vp8/common/rtcd.c +++ b/vp8/common/rtcd.c @@ -7,15 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "vpx_config.h" +#include "./vpx_config.h" #define RTCD_C -#include "vp8_rtcd.h" +#include "./vp8_rtcd.h" #include "vpx_ports/vpx_once.h" -extern void vpx_scale_rtcd(void); void vp8_rtcd() { - vpx_scale_rtcd(); once(setup_rtcd_internal); } diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index bf8a8537c..a5dfd07f9 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -10,7 +10,8 @@ #include "./vpx_config.h" -#include "vp8_rtcd.h" +#include "./vp8_rtcd.h" +#include "./vpx_scale_rtcd.h" #include "vpx/vpx_codec.h" #include "vpx/internal/vpx_codec_internal.h" #include "vpx_version.h" @@ -649,6 +650,7 @@ static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx, vp8_rtcd(); + vpx_scale_rtcd(); if (!ctx->priv) { diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c index 67a0fef64..e0eb30aa5 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c @@ -11,7 +11,8 @@ #include <stdlib.h> #include <string.h> -#include "vp8_rtcd.h" +#include "./vp8_rtcd.h" +#include "./vpx_scale_rtcd.h" #include "vpx/vpx_decoder.h" #include "vpx/vp8dx.h" #include "vpx/internal/vpx_codec_internal.h" @@ -106,6 +107,7 @@ static vpx_codec_err_t vp8_init(vpx_codec_ctx_t *ctx, (void) data; vp8_rtcd(); + vpx_scale_rtcd(); /* This function only allocates space for the vpx_codec_alg_priv_t * structure. More memory may be required at the time the stream |