[SCM] libav/experimental: Fix VP8 decoder dependencies

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:13:33 UTC 2013


The following commit has been merged in the experimental branch:
commit 8d370d88e5e4ca4a887874242212117457f9084f
Author: Martin Storsjö <martin at martin.st>
Date:   Wed Aug 4 05:20:49 2010 +0000

    Fix VP8 decoder dependencies
    
    This reverts rev 24674 - the VP8 decoder actually depends on cabac.o.
    vp8.c includes vp56.h, which includes cabac.h, which has inline functions
    that reference tables from cabac.c.
    
    This fixes compilation with --disable-everything --enable-decoder=vp8.
    
    Originally committed as revision 24692 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index fc5a086..2492e57 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -379,7 +379,7 @@ OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o vp56dsp.o \
                                           vp3dsp.o cabac.o
 OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o vp56dsp.o \
                                           vp3dsp.o vp6dsp.o huffman.o cabac.o
-OBJS-$(CONFIG_VP8_DECODER)             += vp8.o vp8dsp.o
+OBJS-$(CONFIG_VP8_DECODER)             += vp8.o vp8dsp.o cabac.o
 OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o
 OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o
 OBJS-$(CONFIG_WMAPRO_DECODER)          += wmaprodec.o wma.o

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list