[FFmpeg-cvslog] Merge commit '213e606752d16f51337e94431962fb5d7749c07e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  5 19:24:49 2014 +0200| [1e4e760f767b597f88442b75e90d726ae626b230] | committer: Michael Niedermayer

Merge commit '213e606752d16f51337e94431962fb5d7749c07e'

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

Conflicts:
	libavcodec/h264_loopfilter.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e4e760f767b597f88442b75e90d726ae626b230
---