[FFmpeg-cvslog] Merge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4'

Michael Niedermayer git at videolan.org
Sun May 31 23:43:28 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 31 23:23:58 2015 +0200| [da9a6f4a2b9a3d0ab2224923b2e8f984d928791e] | committer: Michael Niedermayer

Merge commit 'eecd29b3fd7fee221580798346d6582b75c7ade4'

* commit 'eecd29b3fd7fee221580798346d6582b75c7ade4':
  ppc: vsx: Implement float_dsp

Conflicts:
	libavutil/ppc/float_dsp_init.c

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

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





More information about the ffmpeg-cvslog mailing list