[SCM] libav/experimental: 10l: Only set *compose97i *add_yblock to dsputils context if we are building with Snow enabled Patch by Oded Shimon < ods15 AH ods15 POIS dyndns POIS org >

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:47:04 UTC 2013


The following commit has been merged in the experimental branch:
commit 13c97a5a0aa7313867b24778a6cb3d94771649c2
Author: Oded Shimon <ods15 at ods15.dyndns.org>
Date:   Fri Mar 17 12:08:46 2006 +0000

    10l: Only set *compose97i *add_yblock to dsputils context if we are building with Snow enabled
    Patch by Oded Shimon < ods15 AH ods15 POIS dyndns POIS org >
    
    Originally committed as revision 5175 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 6bc59db..87eb49b 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -4048,9 +4048,11 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
     c->try_8x8basis= try_8x8basis_c;
     c->add_8x8basis= add_8x8basis_c;
 
+#ifdef CONFIG_SNOW_ENCODER
     c->vertical_compose97i = ff_snow_vertical_compose97i;
     c->horizontal_compose97i = ff_snow_horizontal_compose97i;
     c->inner_add_yblock = ff_snow_inner_add_yblock;
+#endif
 
 #ifdef HAVE_MMX
     dsputil_init_mmx(c, avctx);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list