[FFmpeg-cvslog] Merge commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075'

Michael Niedermayer git at videolan.org
Sat Apr 20 14:39:24 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 14:29:16 2013 +0200| [c5a11ab6d1067f8306b318b9fda10b106389cea0] | committer: Michael Niedermayer

Merge commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075'

* commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075':
  bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/bfin/Makefile
	libavcodec/bfin/hpel_pixels_bfin.S
	libavcodec/bfin/hpeldsp_bfin.c
	libavcodec/bfin/hpeldsp_bfin.h
	libavcodec/hpeldsp.h

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

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





More information about the ffmpeg-cvslog mailing list