1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Merge commit '2143948381c8118bdc2f50bd4079520b9885bd54'

* commit '2143948381c8118bdc2f50bd4079520b9885bd54':
  Drop unnecessary av_unused attributes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-05 19:29:41 +02:00
commit 0a7239ae25
5 changed files with 6 additions and 6 deletions

View File

@ -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;

View File

@ -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);\
}\

View File

@ -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;\

View File

@ -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;\

View File

@ -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;