[FFmpeg-cvslog] Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'

Michael Niedermayer git at videolan.org
Sun Mar 1 00:04:44 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 28 23:56:45 2015 +0100| [5c17377e28e818d3074a608d42821d66f1d26e8d] | committer: Michael Niedermayer

Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'

* commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca':
  fmtconvert: drop unused functions

Conflicts:
	libavcodec/arm/fmtconvert_vfp_armv6.S
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/fmtconvert_init.c

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

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





More information about the ffmpeg-cvslog mailing list