Merge commit '2143948381c8118bdc2f50bd4079520b9885bd54'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/h264_cabac.c
Simple merge

diff --cc libavcodec/h264qpel_template.c
Simple merge

diff --cc libavcodec/rv30dsp.c
Simple merge

diff --cc libavcodec/rv40dsp.c
index 6d08847,da3efb4..19b0e93
--- 1/libavcodec/rv40dsp.c
--- 2/libavcodec/rv40dsp.c
+++ b/libavcodec/rv40dsp.c
@@@ -32,10 -32,9 +32,10 @@@
  #include "pixels.h"
  #include "rnd_avg.h"
  #include "rv34dsp.h"
 +#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 --cc libavcodec/vp56.h
Simple merge