Michael Niedermayer 1e4e760f76 Merge commit '213e606752d16f51337e94431962fb5d7749c07e' ...

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

Conflicts:
	libavcodec/h264_loopfilter.c

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

2014-09-05 19:24:49 +02:00

3.9 KiB

Raw Blame History

View Raw