[FFmpeg-cvslog] Merge commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3'

Michael Niedermayer git at videolan.org
Wed Mar 26 20:40:03 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 20:26:26 2014 +0100| [f38af0143c1849e8c8cea8d3374b4a554763eeee] | committer: Michael Niedermayer

Merge commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3'

* commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3':
  truehd: add hand-scheduled ARM asm version of mlp_filter_channel.

Conflicts:
	libavcodec/arm/Makefile
	libavcodec/arm/mlpdsp_init_arm.c

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

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





More information about the ffmpeg-cvslog mailing list