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

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