Merge commit '2143948381c8118bdc2f50bd4079520b9885bd54'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 17:29:41 +0000 (19:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 18:21:47 +0000 (20:21 +0200)
commit0a7239ae25e0741106b00def14ad8d8d4f211490
treea9d3ec1dd83dd3cb890d12601ebc75a2435e069c
parent7bd0079e9e024faafebcb94be369cf0d1ed7ddee
parent2143948381c8118bdc2f50bd4079520b9885bd54
Merge commit '2143948381c8118bdc2f50bd4079520b9885bd54'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_cabac.c
libavcodec/h264qpel_template.c
libavcodec/rv30dsp.c
libavcodec/rv40dsp.c
libavcodec/vp56.h