From 4a703576f7b22cafeeded8d3a0f85894121a5155 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Fri, 31 Jan 2014 16:32:42 -0800
Subject: [PATCH] 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
---
examples/example_xma.c | 2 +-
test/codec_factory.h | 8 ++++----
test/decode_test_driver.h | 2 +-
test/encode_test_driver.h | 2 +-
vpxdec.c | 2 +-
vpxenc.c | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/examples/example_xma.c b/examples/example_xma.c
index 0e33ff46fb..c960c28468 100644
--- a/examples/example_xma.c
+++ b/examples/example_xma.c
@@ -27,7 +27,7 @@ static int verbose = 0;
static const struct {
const char *name;
- const vpx_codec_iface_t *iface;
+ vpx_codec_iface_t *iface;
} ifaces[] = {
#if CONFIG_VP9_DECODER
{"vp9", &vpx_codec_vp8_dx_algo},
diff --git a/test/codec_factory.h b/test/codec_factory.h
index 38c4d29a0b..80e87c883e 100644
--- a/test/codec_factory.h
+++ b/test/codec_factory.h
@@ -71,7 +71,7 @@ class VP8Decoder : public Decoder {
: Decoder(cfg, deadline) {}
protected:
- virtual const vpx_codec_iface_t* CodecInterface() const {
+ virtual vpx_codec_iface_t* CodecInterface() const {
#if CONFIG_VP8_DECODER
return &vpx_codec_vp8_dx_algo;
#else
@@ -87,7 +87,7 @@ class VP8Encoder : public Encoder {
: Encoder(cfg, deadline, init_flags, stats) {}
protected:
- virtual const vpx_codec_iface_t* CodecInterface() const {
+ virtual vpx_codec_iface_t* CodecInterface() const {
#if CONFIG_VP8_ENCODER
return &vpx_codec_vp8_cx_algo;
#else
@@ -153,7 +153,7 @@ class VP9Decoder : public Decoder {
: Decoder(cfg, deadline) {}
protected:
- virtual const vpx_codec_iface_t* CodecInterface() const {
+ virtual vpx_codec_iface_t* CodecInterface() const {
#if CONFIG_VP9_DECODER
return &vpx_codec_vp9_dx_algo;
#else
@@ -169,7 +169,7 @@ class VP9Encoder : public Encoder {
: Encoder(cfg, deadline, init_flags, stats) {}
protected:
- virtual const vpx_codec_iface_t* CodecInterface() const {
+ virtual vpx_codec_iface_t* CodecInterface() const {
#if CONFIG_VP9_ENCODER
return &vpx_codec_vp9_cx_algo;
#else
diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h
index ddaed9fa0d..3e8ff724b3 100644
--- a/test/decode_test_driver.h
+++ b/test/decode_test_driver.h
@@ -77,7 +77,7 @@ class Decoder {
}
protected:
- virtual const vpx_codec_iface_t* CodecInterface() const = 0;
+ virtual vpx_codec_iface_t* CodecInterface() const = 0;
void InitOnce() {
if (!init_done_) {
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index dbdc33c8eb..4dabcd5b44 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -128,7 +128,7 @@ class Encoder {
}
protected:
- virtual const vpx_codec_iface_t* CodecInterface() const = 0;
+ virtual vpx_codec_iface_t* CodecInterface() const = 0;
const char *EncoderError() {
const char *detail = vpx_codec_error_detail(&encoder_);
diff --git a/vpxdec.c b/vpxdec.c
index cde46e9a75..6d5ca24692 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -39,7 +39,7 @@ static const char *exec_name;
static const struct {
char const *name;
- const vpx_codec_iface_t *(*iface)(void);
+ vpx_codec_iface_t *(*iface)(void);
uint32_t fourcc;
} ifaces[] = {
#if CONFIG_VP8_DECODER
diff --git a/vpxenc.c b/vpxenc.c
index f772432ad1..6ad3b9bd62 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -62,8 +62,8 @@ static const char *exec_name;
static const struct codec_item {
char const *name;
- const vpx_codec_iface_t *(*iface)(void);
- const vpx_codec_iface_t *(*dx_iface)(void);
+ vpx_codec_iface_t *(*iface)(void);
+ vpx_codec_iface_t *(*dx_iface)(void);
unsigned int fourcc;
} codecs[] = {
#if CONFIG_VP8_ENCODER && CONFIG_VP8_DECODER
--
GitLab