[FFmpeg-cvslog] Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'

Michael Niedermayer git at videolan.org
Mon May 6 21:06:22 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  6 20:59:52 2013 +0200| [108e2ae8299a221e78c549a69c09a5eb1cebbd6c] | committer: Michael Niedermayer

Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'

* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
  x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

Conflicts:
	libavcodec/x86/Makefile

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

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





More information about the ffmpeg-cvslog mailing list