[FFmpeg-cvslog] Merge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'

Michael Niedermayer git at videolan.org
Sun Jul 27 00:27:08 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 27 00:19:25 2014 +0200| [706f81a2c27552fdc9d216834eedd36f5804c080] | committer: Michael Niedermayer

Merge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'

* commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d':
  hevc: SSE2 and SSSE3 loop filters

Conflicts:
	libavcodec/hevcdsp.c
	libavcodec/hevcdsp.h
	libavcodec/x86/Makefile
	libavcodec/x86/hevc_deblock.asm
	libavcodec/x86/hevcdsp_init.c

See: de7b89fd43f850d77cf24ad6ae50185dfe391e91 and several others
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list