[FFmpeg-cvslog] Merge commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 17:21:29 2016 +0000| [6bff2b5f6a3dca43bf553866b0f110c47d4ec72d] | committer: Derek Buitenhuis

Merge commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7'

This commit is a no-op.

* commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7':
  v210: Add avx2 version of the 10-bit line encoder
  v210: Add avx2 version of the 8-bit line encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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