[FFmpeg-cvslog] Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  2 10:11:35 2013 +0100| [7146eacfc5f20dea719d6581d72b7532ab39688d] | committer: Michael Niedermayer

Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'

* commit '1700b4e678ed329611a16b20d11e64b7abda4839':
  x86: vp8dsp: Split loopfilter code into a separate file

Conflicts:
	libavcodec/x86/Makefile

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

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