aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-05 19:29:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-05 20:21:47 +0200
commit0a7239ae25e0741106b00def14ad8d8d4f211490 (patch)
treea9d3ec1dd83dd3cb890d12601ebc75a2435e069c
parent7bd0079e9e024faafebcb94be369cf0d1ed7ddee (diff)
parent2143948381c8118bdc2f50bd4079520b9885bd54 (diff)
downloadffmpeg-0a7239ae25e0741106b00def14ad8d8d4f211490.tar.gz
Merge commit '2143948381c8118bdc2f50bd4079520b9885bd54'
* commit '2143948381c8118bdc2f50bd4079520b9885bd54': Drop unnecessary av_unused attributes. Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_cabac.c2
-rw-r--r--libavcodec/h264qpel_template.c2
-rw-r--r--libavcodec/rv30dsp.c2
-rw-r--r--libavcodec/rv40dsp.c2
-rw-r--r--libavcodec/vp56.h4
5 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 5b1a82766c..c2e183d76b 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1604,7 +1604,7 @@ decode_cabac_residual_internal(H264Context *h, int16_t *block,
int index[64];
- int av_unused last;
+ int last;
int coeff_count = 0;
int node_ctx = 0;
diff --git a/libavcodec/h264qpel_template.c b/libavcodec/h264qpel_template.c
index fee4f110e4..27c5b8f17f 100644
--- a/libavcodec/h264qpel_template.c
+++ b/libavcodec/h264qpel_template.c
@@ -378,7 +378,7 @@ static void FUNC(OPNAME ## h264_qpel16_hv_lowpass)(uint8_t *dst, pixeltmp *tmp,
}\
#define H264_MC(OPNAME, SIZE) \
-static av_unused void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc00)(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\
+static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc00)(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\
{\
FUNCC(OPNAME ## pixels ## SIZE)(dst, src, stride, SIZE);\
}\
diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c
index 6cc27a2bd4..8b205e09b6 100644
--- a/libavcodec/rv30dsp.c
+++ b/libavcodec/rv30dsp.c
@@ -31,7 +31,7 @@
#include "rv34dsp.h"
#define RV30_LOWPASS(OPNAME, OP) \
-static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\
+static void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\
const int h = 8;\
const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i;\
diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c
index 6d0884734f..19b0e93696 100644
--- a/libavcodec/rv40dsp.c
+++ b/libavcodec/rv40dsp.c
@@ -35,7 +35,7 @@
#include "libavutil/avassert.h"
#define RV40_LOWPASS(OPNAME, OP) \
-static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride,\
+static void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride,\
const int h, const int C1, const int C2, const int SHIFT){\
const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\
int i;\
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index 1af5eaf502..56c30919b7 100644
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -306,7 +306,7 @@ static av_always_inline int vp8_rac_get(VP56RangeCoder *c)
return vp56_rac_get_prob(c, 128);
}
-static av_unused int vp56_rac_gets(VP56RangeCoder *c, int bits)
+static int vp56_rac_gets(VP56RangeCoder *c, int bits)
{
int value = 0;
@@ -317,7 +317,7 @@ static av_unused int vp56_rac_gets(VP56RangeCoder *c, int bits)
return value;
}
-static av_unused int vp8_rac_get_uint(VP56RangeCoder *c, int bits)
+static int vp8_rac_get_uint(VP56RangeCoder *c, int bits)
{
int value = 0;