Commit 1e41275e authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Silence build warnings with --enable-inspection.

Silence -Wtypedef-redefinition warning in examples/inspect.c when
 building with --enable-inspection flag.

Change-Id: I74bbe9272b028dd7b1df3e36c8fca924ec1eae6b
parent ad66b816
......@@ -37,13 +37,17 @@ extern aom_codec_iface_t aom_codec_av1_dx_algo;
extern aom_codec_iface_t *aom_codec_av1_dx(void);
/*!@} - end algorithm interface member group*/
#ifndef AOM_ACCOUNTING_H_
/** Data structure that stores bit accounting for debug
*/
typedef struct Accounting Accounting;
#endif
#ifndef AOM_INSPECTION_H_
/** Callback that inspects decoder frame data.
*/
typedef void (*aom_inspect_cb)(void *decoder, void *ctx);
#endif
/*!\brief Structure to hold inspection callback and context.
*
......
......@@ -27,17 +27,17 @@
#endif
#include "aom/aom_decoder.h"
#include "./aom_config.h"
#if CONFIG_ACCOUNTING
#include "../av1/decoder/accounting.h"
#endif
#include "../av1/decoder/inspection.h"
#include "aom/aomdx.h"
#include "../tools_common.h"
#include "../video_reader.h"
#include "./aom_config.h"
// #include "av1/av1_dx_iface.c"
#include "../av1/common/onyxc_int.h"
#if CONFIG_ACCOUNTING
#include "../av1/decoder/accounting.h"
#endif
#include "../av1/decoder/inspection.h"
#include "../video_common.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment