Commit 4a703576 authored by James Zern's avatar James Zern

remove duplicate const from vpx_codec_iface_t use

the public typedef already includes a const, quiets
'same type qualifier used more than once' warnings

Change-Id: Ib118b3b116fba59d4c6ead84d85b26e5d3ed363d
parent 903801f1
...@@ -27,7 +27,7 @@ static int verbose = 0; ...@@ -27,7 +27,7 @@ static int verbose = 0;
static const struct { static const struct {
const char *name; const char *name;
const vpx_codec_iface_t *iface; vpx_codec_iface_t *iface;
} ifaces[] = { } ifaces[] = {
#if CONFIG_VP9_DECODER #if CONFIG_VP9_DECODER
{"vp9", &vpx_codec_vp8_dx_algo}, {"vp9", &vpx_codec_vp8_dx_algo},
......
...@@ -71,7 +71,7 @@ class VP8Decoder : public Decoder { ...@@ -71,7 +71,7 @@ class VP8Decoder : public Decoder {
: Decoder(cfg, deadline) {} : Decoder(cfg, deadline) {}
protected: protected:
virtual const vpx_codec_iface_t* CodecInterface() const { virtual vpx_codec_iface_t* CodecInterface() const {
#if CONFIG_VP8_DECODER #if CONFIG_VP8_DECODER
return &vpx_codec_vp8_dx_algo; return &vpx_codec_vp8_dx_algo;
#else #else
...@@ -87,7 +87,7 @@ class VP8Encoder : public Encoder { ...@@ -87,7 +87,7 @@ class VP8Encoder : public Encoder {
: Encoder(cfg, deadline, init_flags, stats) {} : Encoder(cfg, deadline, init_flags, stats) {}
protected: protected:
virtual const vpx_codec_iface_t* CodecInterface() const { virtual vpx_codec_iface_t* CodecInterface() const {
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
return &vpx_codec_vp8_cx_algo; return &vpx_codec_vp8_cx_algo;
#else #else
...@@ -153,7 +153,7 @@ class VP9Decoder : public Decoder { ...@@ -153,7 +153,7 @@ class VP9Decoder : public Decoder {
: Decoder(cfg, deadline) {} : Decoder(cfg, deadline) {}
protected: protected:
virtual const vpx_codec_iface_t* CodecInterface() const { virtual vpx_codec_iface_t* CodecInterface() const {
#if CONFIG_VP9_DECODER #if CONFIG_VP9_DECODER
return &vpx_codec_vp9_dx_algo; return &vpx_codec_vp9_dx_algo;
#else #else
...@@ -169,7 +169,7 @@ class VP9Encoder : public Encoder { ...@@ -169,7 +169,7 @@ class VP9Encoder : public Encoder {
: Encoder(cfg, deadline, init_flags, stats) {} : Encoder(cfg, deadline, init_flags, stats) {}
protected: protected:
virtual const vpx_codec_iface_t* CodecInterface() const { virtual vpx_codec_iface_t* CodecInterface() const {
#if CONFIG_VP9_ENCODER #if CONFIG_VP9_ENCODER
return &vpx_codec_vp9_cx_algo; return &vpx_codec_vp9_cx_algo;
#else #else
......
...@@ -77,7 +77,7 @@ class Decoder { ...@@ -77,7 +77,7 @@ class Decoder {
} }
protected: protected:
virtual const vpx_codec_iface_t* CodecInterface() const = 0; virtual vpx_codec_iface_t* CodecInterface() const = 0;
void InitOnce() { void InitOnce() {
if (!init_done_) { if (!init_done_) {
......
...@@ -128,7 +128,7 @@ class Encoder { ...@@ -128,7 +128,7 @@ class Encoder {
} }
protected: protected:
virtual const vpx_codec_iface_t* CodecInterface() const = 0; virtual vpx_codec_iface_t* CodecInterface() const = 0;
const char *EncoderError() { const char *EncoderError() {
const char *detail = vpx_codec_error_detail(&encoder_); const char *detail = vpx_codec_error_detail(&encoder_);
......
...@@ -39,7 +39,7 @@ static const char *exec_name; ...@@ -39,7 +39,7 @@ static const char *exec_name;
static const struct { static const struct {
char const *name; char const *name;
const vpx_codec_iface_t *(*iface)(void); vpx_codec_iface_t *(*iface)(void);
uint32_t fourcc; uint32_t fourcc;
} ifaces[] = { } ifaces[] = {
#if CONFIG_VP8_DECODER #if CONFIG_VP8_DECODER
......
...@@ -62,8 +62,8 @@ static const char *exec_name; ...@@ -62,8 +62,8 @@ static const char *exec_name;
static const struct codec_item { static const struct codec_item {
char const *name; char const *name;
const vpx_codec_iface_t *(*iface)(void); vpx_codec_iface_t *(*iface)(void);
const vpx_codec_iface_t *(*dx_iface)(void); vpx_codec_iface_t *(*dx_iface)(void);
unsigned int fourcc; unsigned int fourcc;
} codecs[] = { } codecs[] = {
#if CONFIG_VP8_ENCODER && CONFIG_VP8_DECODER #if CONFIG_VP8_ENCODER && CONFIG_VP8_DECODER
......
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