[FFmpeg-cvslog] r24715 - in trunk: configure libavcodec/Makefile

[diego]

Author: diego
Date: Fri Aug  6 12:29:14 2010
New Revision: 24715

Log:
Add a CONFIG_ variable for generic Huffman routines.

Modified:
   trunk/configure
   trunk/libavcodec/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	Fri Aug  6 12:26:30 2010	(r24714)
+++ trunk/configure	Fri Aug  6 12:29:14 2010	(r24715)
@@ -104,6 +104,7 @@ Configuration options:
   --disable-dct            disable DCT code
   --disable-fft            disable FFT code
   --disable-golomb         disable Golomb code
+  --disable-huffman        disable Huffman code
   --disable-lpc            disable LPC code
   --disable-mdct           disable MDCT code
   --disable-rdft           disable RDFT code
@@ -867,6 +868,7 @@ CONFIG_LIST="
     gray
     h264dsp
     hardcoded_tables
+    huffman
     libdc1394
     libdirac
     libfaac
@@ -1191,6 +1193,7 @@ flashsv_decoder_select="zlib"
 flashsv_encoder_select="zlib"
 flv_decoder_select="h263_decoder"
 flv_encoder_select="h263_encoder"
+fraps_decoder_select="huffman"
 h261_encoder_select="aandct"
 h263_decoder_select="h263_parser"
 h263_encoder_select="aandct"
@@ -1269,6 +1272,7 @@ vc1_vaapi_hwaccel_select="vaapi vc1_deco
 vc1_vdpau_decoder_select="vdpau vc1_decoder"
 vorbis_decoder_select="mdct"
 vorbis_encoder_select="mdct"
+vp6_decoder_select="huffman"
 vp6a_decoder_select="vp6_decoder"
 vp6f_decoder_select="vp6_decoder"
 vp8_decoder_select="h264dsp"

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Fri Aug  6 12:26:30 2010	(r24714)
+++ trunk/libavcodec/Makefile	Fri Aug  6 12:29:14 2010	(r24715)
@@ -33,6 +33,7 @@ FFT-OBJS-$(CONFIG_HARDCODED_TABLES)    +
 OBJS-$(CONFIG_FFT)                     += avfft.o fft.o $(FFT-OBJS-yes)
 OBJS-$(CONFIG_GOLOMB)                  += golomb.o
 OBJS-$(CONFIG_H264DSP)                 += h264dsp.o h264idct.o h264pred.o
+OBJS-$(CONFIG_HUFFMAN)                 += huffman.o
 OBJS-$(CONFIG_LPC)                     += lpc.o
 OBJS-$(CONFIG_LSP)                     += lsp.o
 OBJS-$(CONFIG_MDCT)                    += mdct.o
@@ -128,7 +129,7 @@ OBJS-$(CONFIG_FLASHSV_DECODER)         +
 OBJS-$(CONFIG_FLASHSV_ENCODER)         += flashsvenc.o
 OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.o
 OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
-OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o huffman.o
+OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o
 OBJS-$(CONFIG_FRWU_DECODER)            += frwu.o
 OBJS-$(CONFIG_GIF_DECODER)             += gifdec.o lzw.o
 OBJS-$(CONFIG_GIF_ENCODER)             += gif.o lzwenc.o
@@ -378,7 +379,7 @@ OBJS-$(CONFIG_VP3_DECODER)             +
 OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o vp56dsp.o \
                                           vp3dsp.o vp56rac.o
 OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o vp56dsp.o \
-                                          vp3dsp.o vp6dsp.o huffman.o vp56rac.o
+                                          vp3dsp.o vp6dsp.o vp56rac.o
 OBJS-$(CONFIG_VP8_DECODER)             += vp8.o vp8dsp.o vp56rac.o
 OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o
 OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o