Merge commit '213e606752d16f51337e94431962fb5d7749c07e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 17:24:49 +0000 (19:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 17:24:49 +0000 (19:24 +0200)
commit1e4e760f767b597f88442b75e90d726ae626b230
treebbf016203da738a1f429becdc9e8568dd1b39aa1
parent73aeb27cfe4ec51c2577097c980fe126dcd1908b
parent213e606752d16f51337e94431962fb5d7749c07e
Merge commit '213e606752d16f51337e94431962fb5d7749c07e'

* commit '213e606752d16f51337e94431962fb5d7749c07e':
  Replace av_unused attributes by block structures

Conflicts:
libavcodec/h264_loopfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/faanidct.c
libavcodec/h264_loopfilter.c
libavcodec/rangecoder.h