[FFmpeg-cvslog] Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'

Michael Niedermayer git at videolan.org
Fri Feb 28 17:20:49 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 28 17:13:00 2014 +0100| [5ba1648318161b394499a04e8fc7385ee2fbf375] | committer: Michael Niedermayer

Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'

* commit 'b23650491fbd579a4365f42bd42575afb7b53f7e':
  prores: Use consistent names for DSP arch initialization functions

Conflicts:
	libavcodec/proresdsp.c
	libavcodec/proresdsp.h
	libavcodec/x86/proresdsp_init.c

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

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





More information about the ffmpeg-cvslog mailing list