shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Making vp9_initialize_dec() static."

--- a/vp9/decoder/vp9_decoder.c

+++ b/vp9/decoder/vp9_decoder.c

@@ -32,7 +32,7 @@

 #include "vp9/decoder/vp9_detokenize.h"

 #include "vp9/decoder/vp9_dthread.h"

-void vp9_initialize_dec() {

+static void initialize_dec() {

   static int init_done = 0;

   if (!init_done) {

@@ -58,7 +58,7 @@

   }

   cm->error.setjmp = 1;

-  vp9_initialize_dec();

+  initialize_dec();

   vp9_rtcd();

--- a/vp9/decoder/vp9_decoder.h

+++ b/vp9/decoder/vp9_decoder.h

@@ -53,8 +53,6 @@

   int inv_tile_order;

 } VP9Decoder;

-void vp9_initialize_dec();

-

 int vp9_receive_compressed_data(struct VP9Decoder *pbi,

                                 size_t size, const uint8_t **dest,

                                 int64_t time_stamp);

--- a/vp9/vp9_dx_iface.c

+++ b/vp9/vp9_dx_iface.c

@@ -231,8 +231,6 @@

   ctx->pbi->max_threads = ctx->cfg.threads;

   ctx->pbi->inv_tile_order = ctx->invert_tile_order;

-  vp9_initialize_dec();

-

   // If postprocessing was enabled by the application and a

   // configuration has not been provided, default it.

   if (!ctx->postproc_cfg_set &&