aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/sunrastenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-26 20:26:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-26 20:39:10 +0100
commitf38af0143c1849e8c8cea8d3374b4a554763eeee (patch)
tree0d84e984281c2b46123d3e3854b262031bc7d287 /libavcodec/sunrastenc.c
parent87b128d5ef6aeb01cc8bba167c929c74cbf2e7c7 (diff)
parent15a29c39d9ef15b0783c04b3228e1c55f6701ee3 (diff)
downloadffmpeg-f38af0143c1849e8c8cea8d3374b4a554763eeee.tar.gz
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@gmx.at>
Diffstat (limited to 'libavcodec/sunrastenc.c')
0 files changed, 0 insertions, 0 deletions