Mercurial > libavcodec.hg

changeset 3013:b6a90fabaa76 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ugly, but necessary
author melanson
date Thu, 05 Jan 2006 06:58:36 +0000
parents 088920c095fc
children 959b8ad880dc
files dsputil.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dsputil.c	Wed Jan 04 22:34:11 2006 +0000
+++ b/dsputil.c	Thu Jan 05 06:58:36 2006 +0000
@@ -3643,7 +3643,9 @@
 WARPER8_16_SQ(hadamard8_diff8x8_c, hadamard8_diff16_c)
 WARPER8_16_SQ(hadamard8_intra8x8_c, hadamard8_intra16_c)
 WARPER8_16_SQ(dct_sad8x8_c, dct_sad16_c)
+#ifdef CONFIG_GPL
 WARPER8_16_SQ(dct264_sad8x8_c, dct264_sad16_c)
+#endif
 WARPER8_16_SQ(dct_max8x8_c, dct_max16_c)
 WARPER8_16_SQ(quant_psnr8x8_c, quant_psnr16_c)
 WARPER8_16_SQ(rd8x8_c, rd16_c)
@@ -3927,7 +3929,9 @@
     c->hadamard8_diff[4]= hadamard8_intra16_c;
     SET_CMP_FUNC(dct_sad)
     SET_CMP_FUNC(dct_max)
+#ifdef CONFIG_GPL
     SET_CMP_FUNC(dct264_sad)
+#endif
     c->sad[0]= pix_abs16_c;
     c->sad[1]= pix_abs8_c;
     c->sse[0]= sse16_c;