aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/colorspace-test.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-29 14:38:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-29 14:42:34 +0200
commitdb6b389c7f2176487cc4622a18f58e6b10af8e99 (patch)
treecaf15aa1b76925c7e152329af6d22c71523c12f4 /libswscale/colorspace-test.c
parent477641e9f8a711b65a463ea75a4167b7cfdc84a5 (diff)
parenta519583991c38d38503ab08357716513facc5725 (diff)
downloadffmpeg-db6b389c7f2176487cc4622a18f58e6b10af8e99.tar.gz
Merge commit 'a519583991c38d38503ab08357716513facc5725'
* commit 'a519583991c38d38503ab08357716513facc5725': swscale: x86: Hide arch-specific initialization details Conflicts: libswscale/x86/Makefile libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/colorspace-test.c')
0 files changed, 0 insertions, 0 deletions