add some #ifdef CONFIG_ENCODERS/DECODERS

Originally committed as revision 6356 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index cf65d172cbc809a3961b4c3b08778a23e837844d..a583e7ceeace61c4f1975a9ca3094640b2b3c81f 100644 (file)
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -462,6 +462,7 @@ for(i=0; i<s->avctx->extradata_size; i++){
     return (get_bits_count(&a->gb)+31)/32*4;
 }
 
+#ifdef CONFIG_ENCODERS
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     ASV1Context * const a = avctx->priv_data;
     AVFrame *pict = data;
@@ -515,6 +516,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
 
     return size*4;
 }
+#endif /* CONFIG_ENCODERS */
 
 static void common_init(AVCodecContext *avctx){
     ASV1Context * const a = avctx->priv_data;
@@ -564,6 +566,7 @@ static int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
+#ifdef CONFIG_ENCODERS
 static int encode_init(AVCodecContext *avctx){
     ASV1Context * const a = avctx->priv_data;
     int i;
@@ -587,6 +590,7 @@ static int encode_init(AVCodecContext *avctx){
 
     return 0;
 }
+#endif
 
 static int decode_end(AVCodecContext *avctx){
     ASV1Context * const a = avctx->priv_data;

diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index fa2952dc6590e0679b92822f0f4e51ab7eb5a80d..c6f039923d2c8bd2eda9d0bd3fdeb251444df2a8 100644 (file)
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -1010,6 +1010,7 @@ static int dv_decode_mt(AVCodecContext *avctx, void* sl)
     return 0;
 }
 
+#ifdef CONFIG_ENCODERS
 static int dv_encode_mt(AVCodecContext *avctx, void* sl)
 {
     DVVideoContext *s = avctx->priv_data;
@@ -1028,7 +1029,9 @@ static int dv_encode_mt(AVCodecContext *avctx, void* sl)
                             &s->sys->video_place[slice*5]);
     return 0;
 }
+#endif
 
+#ifdef CONFIG_DECODERS
 /* NOTE: exactly one frame must be given (120000 bytes for NTSC,
    144000 bytes for PAL - or twice those for 50Mbps) */
 static int dvvideo_decode_frame(AVCodecContext *avctx,
@@ -1068,6 +1071,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
 
     return s->sys->frame_size;
 }
+#endif
 
 
 static inline int dv_write_pack(enum dv_pack_type pack_id, DVVideoContext *c, uint8_t* buf)
@@ -1242,6 +1246,7 @@ AVCodec dvvideo_encoder = {
 };
 #endif // CONFIG_DVVIDEO_ENCODER
 
+#ifdef CONFIG_DVVIDEO_DECODER
 AVCodec dvvideo_decoder = {
     "dvvideo",
     CODEC_TYPE_VIDEO,
@@ -1254,3 +1259,4 @@ AVCodec dvvideo_decoder = {
     CODEC_CAP_DR1,
     NULL
 };
+#endif

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 443950cc002fecf51332b9aed7e5921d88f9cf7d..30fca46dc2e65e6bbeb716ec04aeff12c9532a66 100644 (file)
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -354,6 +354,7 @@ static inline int get_vlc_symbol(GetBitContext *gb, VlcState * const state, int
     return ret;
 }
 
+#ifdef CONFIG_ENCODERS
 static inline int encode_line(FFV1Context *s, int w, int_fast16_t *sample[2], int plane_index, int bits){
     PlaneContext * const p= &s->plane[plane_index];
     RangeCoder * const c= &s->c;
@@ -527,6 +528,7 @@ static void write_header(FFV1Context *f){
     for(i=0; i<5; i++)
         write_quant_table(c, f->quant_table[i]);
 }
+#endif /* CONFIG_ENCODERS */
 
 static int common_init(AVCodecContext *avctx){
     FFV1Context *s = avctx->priv_data;
@@ -545,6 +547,7 @@ static int common_init(AVCodecContext *avctx){
     return 0;
 }
 
+#ifdef CONFIG_ENCODERS
 static int encode_init(AVCodecContext *avctx)
 {
     FFV1Context *s = avctx->priv_data;
@@ -608,6 +611,7 @@ static int encode_init(AVCodecContext *avctx)
 
     return 0;
 }
+#endif /* CONFIG_ENCODERS */
 
 
 static void clear_state(FFV1Context *f){
@@ -632,6 +636,7 @@ static void clear_state(FFV1Context *f){
     }
 }
 
+#ifdef CONFIG_ENCODERS
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     FFV1Context *f = avctx->priv_data;
     RangeCoder * const c= &f->c;
@@ -687,6 +692,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
         return used_count + (put_bits_count(&f->pb)+7)/8;
     }
 }
+#endif /* CONFIG_ENCODERS */
 
 static int common_end(AVCodecContext *avctx){
     FFV1Context *s = avctx->priv_data;

diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 8114fe0f324bdfbea25ea6051a97bc29c9742dae..e636a42ccb564a7cc1a59faa8fcd7d8416f25d05 100644 (file)
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -299,6 +299,7 @@ static int16_t g726_decode(G726Context* c, int16_t i)
     return g726_iterate(c, i);
 }
 
+#ifdef CONFIG_ENCODERS
 static int16_t g726_encode(G726Context* c, int16_t sig)
 {
    uint8_t i;
@@ -307,6 +308,7 @@ static int16_t g726_encode(G726Context* c, int16_t sig)
    g726_iterate(c, i);
    return i;
 }
+#endif
 
 /* Interfacing to the libavcodec */
 
@@ -350,6 +352,7 @@ static int g726_close(AVCodecContext *avctx)
     return 0;
 }
 
+#ifdef CONFIG_ENCODERS
 static int g726_encode_frame(AVCodecContext *avctx,
                             uint8_t *dst, int buf_size, void *data)
 {
@@ -366,6 +369,7 @@ static int g726_encode_frame(AVCodecContext *avctx,
 
     return put_bits_count(&pb)>>3;
 }
+#endif
 
 static int g726_decode_frame(AVCodecContext *avctx,
                              void *data, int *data_size,

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index f3d83187936ed4b38ab602c7c82f58b83bf15caf..e5d97fb408ee53b1dae9ef9cb0aac81bb000f64c 100644 (file)
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -60,6 +60,8 @@ static void h263p_encode_umotion(MpegEncContext * s, int val);
 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block,
                                int n, int dc, uint8_t *scan_table,
                                PutBitContext *dc_pb, PutBitContext *ac_pb);
+static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
+                                  uint8_t *scan_table);
 #endif
 
 static int h263_decode_motion(MpegEncContext * s, int pred, int fcode);
@@ -69,10 +71,8 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
 static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
 static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
                               int n, int coded, int intra, int rvlc);
-static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
-                               uint8_t *scan_table);
-static int h263_pred_dc(MpegEncContext * s, int n, uint16_t **dc_val_ptr);
 #ifdef CONFIG_ENCODERS
+static int h263_pred_dc(MpegEncContext * s, int n, uint16_t **dc_val_ptr);
 static void mpeg4_encode_visual_object_header(MpegEncContext * s);
 static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number);
 #endif //CONFIG_ENCODERS
@@ -1515,6 +1515,7 @@ void ff_h263_loop_filter(MpegEncContext * s){
     }
 }
 
+#ifdef CONFIG_ENCODERS
 static int h263_pred_dc(MpegEncContext * s, int n, uint16_t **dc_val_ptr)
 {
     int x, y, wrap, a, c, pred_dc, scale;
@@ -1559,6 +1560,7 @@ static int h263_pred_dc(MpegEncContext * s, int n, uint16_t **dc_val_ptr)
     *dc_val_ptr = &dc_val[x + y * wrap];
     return pred_dc;
 }
+#endif /* CONFIG_ENCODERS */
 
 static void h263_pred_acdc(MpegEncContext * s, DCTELEM *block, int n)
 {

diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index d14d584d0fcec504d79bfc85855b07feff8015e5..872b69a6799672f2fc75cef6f2b36f5b2186584b 100644 (file)
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -236,6 +236,7 @@ static int generate_bits_table(uint32_t *dst, uint8_t *len_table){
     return 0;
 }
 
+#ifdef CONFIG_ENCODERS
 static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){
     uint64_t counts[2*size];
     int up[2*size];
@@ -291,6 +292,7 @@ static void generate_len_table(uint8_t *dst, uint64_t *stats, int size){
         if(i==size) break;
     }
 }
+#endif /* CONFIG_ENCODERS */
 
 static int read_huffman_tables(HYuvContext *s, uint8_t *src, int length){
     GetBitContext gb;
@@ -375,6 +377,7 @@ static int common_init(AVCodecContext *avctx){
     return 0;
 }
 
+#ifdef CONFIG_DECODERS
 static int decode_init(AVCodecContext *avctx)
 {
     HYuvContext *s = avctx->priv_data;
@@ -470,7 +473,9 @@ s->bgr32=1;
 
     return 0;
 }
+#endif
 
+#ifdef CONFIG_ENCODERS
 static int store_table(HYuvContext *s, uint8_t *len, uint8_t *buf){
     int i;
     int index= 0;
@@ -612,6 +617,7 @@ static int encode_init(AVCodecContext *avctx)
 
     return 0;
 }
+#endif /* CONFIG_ENCODERS */
 
 static void decode_422_bitstream(HYuvContext *s, int count){
     int i;
@@ -637,6 +643,7 @@ static void decode_gray_bitstream(HYuvContext *s, int count){
     }
 }
 
+#ifdef CONFIG_ENCODERS
 static int encode_422_bitstream(HYuvContext *s, int count){
     int i;
 
@@ -711,6 +718,7 @@ static int encode_gray_bitstream(HYuvContext *s, int count){
     }
     return 0;
 }
+#endif /* CONFIG_ENCODERS */
 
 static void decode_bgr_bitstream(HYuvContext *s, int count){
     int i;
@@ -748,6 +756,7 @@ static void decode_bgr_bitstream(HYuvContext *s, int count){
     }
 }
 
+#ifdef CONFIG_DECODERS
 static void draw_slice(HYuvContext *s, int y){
     int h, cy;
     int offset[4];
@@ -1014,6 +1023,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
 
     return (get_bits_count(&s->gb)+31)/32*4 + table_size;
 }
+#endif
 
 static int common_end(HYuvContext *s){
     int i;
@@ -1024,6 +1034,7 @@ static int common_end(HYuvContext *s){
     return 0;
 }
 
+#ifdef CONFIG_DECODERS
 static int decode_end(AVCodecContext *avctx)
 {
     HYuvContext *s = avctx->priv_data;
@@ -1038,7 +1049,9 @@ static int decode_end(AVCodecContext *avctx)
 
     return 0;
 }
+#endif
 
+#ifdef CONFIG_ENCODERS
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     HYuvContext *s = avctx->priv_data;
     AVFrame *pict = data;
@@ -1218,7 +1231,9 @@ static int encode_end(AVCodecContext *avctx)
 
     return 0;
 }
+#endif /* CONFIG_ENCODERS */
 
+#ifdef CONFIG_DECODERS
 AVCodec huffyuv_decoder = {
     "huffyuv",
     CODEC_TYPE_VIDEO,
@@ -1244,6 +1259,7 @@ AVCodec ffvhuff_decoder = {
     CODEC_CAP_DR1 | CODEC_CAP_DRAW_HORIZ_BAND,
     NULL
 };
+#endif
 
 #ifdef CONFIG_ENCODERS
 

diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index 6fab8f647301aa70fd99f6b0f0c45d834dc8eb5e..09a7e1e1b8a513535cfecc99a880d917f54e465b 100644 (file)
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -2527,6 +2527,7 @@ static void gmc_mmx(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int o
     }
 }
 
+#ifdef CONFIG_ENCODERS
 static int try_8x8basis_mmx(int16_t rem[64], int16_t weight[64], int16_t basis[64], int scale){
     long i=0;
 
@@ -2612,6 +2613,7 @@ static void add_8x8basis_mmx(int16_t rem[64], int16_t basis[64], int scale){
         }
     }
 }
+#endif /* CONFIG_ENCODERS */
 
 #define PREFETCH(name, op) \
 void name(void *mem, int stride, int h){\

diff --git a/libavcodec/lcl.c b/libavcodec/lcl.c
index 0bc118af20ca18b6f529ce050ddcdb9d63b0b217..569c3f71e59bc1e95176abf8117574b7694a1ebf 100644 (file)
--- a/libavcodec/lcl.c
+++ b/libavcodec/lcl.c
@@ -190,7 +190,7 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha
 
 
 
-
+#ifdef CONFIG_DECODERS
 /*
  *
  * Decode a frame
@@ -544,9 +544,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
     /* always report that the buffer was completely consumed */
     return buf_size;
 }
+#endif
 
-
-
+#ifdef CONFIG_ENCODERS
 /*
  *
  * Encode a frame
@@ -605,9 +605,9 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     return c->zstream.total_out;
 #endif
 }
+#endif /* CONFIG_ENCODERS */
 
-
-
+#ifdef CONFIG_DECODERS
 /*
  *
  * Init lcl decoder
@@ -769,9 +769,9 @@ static int decode_init(AVCodecContext *avctx)
 
     return 0;
 }
+#endif /* CONFIG_DECODERS */
 
-
-
+#ifdef CONFIG_ENCODERS
 /*
  *
  * Init lcl encoder
@@ -839,11 +839,11 @@ static int encode_init(AVCodecContext *avctx)
     return 0;
 #endif
 }
+#endif /* CONFIG_ENCODERS */
 
 
 
-
-
+#ifdef CONFIG_DECODERS
 /*
  *
  * Uninit lcl decoder
@@ -861,9 +861,9 @@ static int decode_end(AVCodecContext *avctx)
 
         return 0;
 }
+#endif
 
-
-
+#ifdef CONFIG_ENCODERS
 /*
  *
  * Uninit lcl encoder
@@ -881,7 +881,9 @@ static int encode_end(AVCodecContext *avctx)
 
     return 0;
 }
+#endif
 
+#ifdef CONFIG_MSZH_DECODER
 AVCodec mszh_decoder = {
         "mszh",
         CODEC_TYPE_VIDEO,
@@ -893,8 +895,9 @@ AVCodec mszh_decoder = {
         decode_frame,
         CODEC_CAP_DR1,
 };
+#endif
 
-
+#ifdef CONFIG_ZLIB_DECODER
 AVCodec zlib_decoder = {
         "zlib",
         CODEC_TYPE_VIDEO,
@@ -906,6 +909,7 @@ AVCodec zlib_decoder = {
         decode_frame,
         CODEC_CAP_DR1,
 };
+#endif
 
 #ifdef CONFIG_ENCODERS
 

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index b9fc6fd052497fc223c2c01a7189085d9a2b8722..b7fe2e9219c418a113b22de371ad673eadec7754 100644 (file)
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2579,7 +2579,7 @@ retry:
     return buf_size;
 }
 
-
+#ifdef CONFIG_MP3ADU_DECODER
 static int decode_frame_adu(AVCodecContext * avctx,
                         void *data, int *data_size,
                         uint8_t * buf, int buf_size)
@@ -2627,8 +2627,9 @@ static int decode_frame_adu(AVCodecContext * avctx,
     *data_size = out_size;
     return buf_size;
 }
+#endif /* CONFIG_MP3ADU_DECODER */
 
-
+#ifdef CONFIG_MP3ON4_DECODER
 /* Next 3 arrays are indexed by channel config number (passed via codecdata) */
 static int mp3Frames[16] = {0,1,1,2,3,3,4,5,2};   /* number of mp3 decoder instances */
 static int mp3Channels[16] = {0,1,2,3,4,5,6,8,4}; /* total output channels */
@@ -2785,8 +2786,9 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
     *data_size = out_size;
     return buf_size;
 }
+#endif /* CONFIG_MP3ON4_DECODER */
 
-
+#ifdef CONFIG_MP2_DECODER
 AVCodec mp2_decoder =
 {
     "mp2",
@@ -2799,7 +2801,8 @@ AVCodec mp2_decoder =
     decode_frame,
     CODEC_CAP_PARSE_ONLY,
 };
-
+#endif
+#ifdef CONFIG_MP3_DECODER
 AVCodec mp3_decoder =
 {
     "mp3",
@@ -2812,7 +2815,8 @@ AVCodec mp3_decoder =
     decode_frame,
     CODEC_CAP_PARSE_ONLY,
 };
-
+#endif
+#ifdef CONFIG_MP3ADU_DECODER
 AVCodec mp3adu_decoder =
 {
     "mp3adu",
@@ -2825,7 +2829,8 @@ AVCodec mp3adu_decoder =
     decode_frame_adu,
     CODEC_CAP_PARSE_ONLY,
 };
-
+#endif
+#ifdef CONFIG_MP3ON4_DECODER
 AVCodec mp3on4_decoder =
 {
     "mp3on4",
@@ -2838,3 +2843,4 @@ AVCodec mp3on4_decoder =
     decode_frame_mp3on4,
     0
 };
+#endif

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 6ace6fa4a865ab6718f453b3639a9366c7623ec2..c8fb2a4a1869f22c7f3b7b73a6b478e0eac6417e 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -326,6 +326,7 @@ static void copy_picture(Picture *dst, Picture *src){
     dst->type= FF_BUFFER_TYPE_COPY;
 }
 
+#ifdef CONFIG_ENCODERS
 static void copy_picture_attributes(MpegEncContext *s, AVFrame *dst, AVFrame *src){
     int i;
 
@@ -364,6 +365,7 @@ static void copy_picture_attributes(MpegEncContext *s, AVFrame *dst, AVFrame *sr
         }
     }
 }
+#endif
 
 /**
  * allocates a Picture
@@ -565,6 +567,7 @@ void ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src){
 //STOP_TIMER("update_duplicate_context") //about 10k cycles / 0.01 sec for 1000frames on 1ghz with 2 threads
 }
 
+#ifdef CONFIG_ENCODERS
 static void update_duplicate_context_after_me(MpegEncContext *dst, MpegEncContext *src){
 #define COPY(a) dst->a= src->a
     COPY(pict_type);
@@ -581,6 +584,7 @@ static void update_duplicate_context_after_me(MpegEncContext *dst, MpegEncContex
     COPY(partitioned_frame); //FIXME don't set in encode_header
 #undef COPY
 }
+#endif
 
 /**
  * sets the given MpegEncContext to common defaults (same for encoding and decoding).
@@ -5707,8 +5711,6 @@ static int encode_picture(MpegEncContext *s, int picture_number)
     emms_c();
 }
 
-#endif //CONFIG_ENCODERS
-
 static void  denoise_dct_c(MpegEncContext *s, DCTELEM *block){
     const int intra= s->mb_intra;
     int i;
@@ -5733,8 +5735,6 @@ static void  denoise_dct_c(MpegEncContext *s, DCTELEM *block){
     }
 }
 
-#ifdef CONFIG_ENCODERS
-
 static int dct_quantize_trellis_c(MpegEncContext *s,
                         DCTELEM *block, int n,
                         int qscale, int *overflow){

diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index fcf629f6b2dbeebeafd72d4242987572de1dcc4d..23c41ef4055c9ab38595cc8404d168cab6e143e1 100644 (file)
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -65,10 +65,10 @@ static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
 static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
 static int msmpeg4_decode_motion(MpegEncContext * s,
                                  int *mx_ptr, int *my_ptr);
-static void msmpeg4v2_encode_motion(MpegEncContext * s, int val);
 static void init_h263_dc_for_msmpeg4(void);
 static inline void msmpeg4_memsetw(short *tab, int val, int n);
 #ifdef CONFIG_ENCODERS
+static void msmpeg4v2_encode_motion(MpegEncContext * s, int val);
 static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra);
 #endif //CONFIG_ENCODERS
 static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
@@ -1343,6 +1343,7 @@ static inline void msmpeg4_memsetw(short *tab, int val, int n)
         tab[i] = val;
 }
 
+#ifdef CONFIG_ENCODERS
 static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
 {
     int range, bit_size, sign, code, bits;
@@ -1375,6 +1376,7 @@ static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
         }
     }
 }
+#endif
 
 /* this is identical to h263 except that its range is multiplied by 2 */
 static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code)

diff --git a/libavcodec/png.c b/libavcodec/png.c
index efe4cdf4ffe717500d8aa6a03654056646855807..482892091edb96726d895c71fde611ccbf7a8a37 100644 (file)
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -90,12 +90,14 @@ static unsigned int get32(uint8_t **b){
     return ((*b)[-4]<<24) + ((*b)[-3]<<16) + ((*b)[-2]<<8) + (*b)[-1];
 }
 
+#ifdef CONFIG_ENCODERS
 static void put32(uint8_t **b, unsigned int v){
     *(*b)++= v>>24;
     *(*b)++= v>>16;
     *(*b)++= v>>8;
     *(*b)++= v;
 }
+#endif
 
 static const uint8_t pngsig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
 
@@ -233,6 +235,7 @@ static void png_put_interlaced_row(uint8_t *dst, int width,
     }
 }
 
+#ifdef CONFIG_ENCODERS
 static void png_get_interlaced_row(uint8_t *dst, int row_size,
                                    int bits_per_pixel, int pass,
                                    const uint8_t *src, int width)
@@ -270,6 +273,7 @@ static void png_get_interlaced_row(uint8_t *dst, int row_size,
         break;
     }
 }
+#endif
 
 /* XXX: optimize */
 /* NOTE: 'dst' can be equal to 'last' */
@@ -338,6 +342,7 @@ static void png_filter_row(uint8_t *dst, int filter_type,
     }
 }
 
+#ifdef CONFIG_ENCODERS
 static void convert_from_rgba32(uint8_t *dst, const uint8_t *src, int width)
 {
     uint8_t *d;
@@ -354,7 +359,9 @@ static void convert_from_rgba32(uint8_t *dst, const uint8_t *src, int width)
         d += 4;
     }
 }
+#endif
 
+#ifdef CONFIG_DECODERS
 static void convert_to_rgba32(uint8_t *dst, const uint8_t *src, int width)
 {
     int j;
@@ -684,7 +691,9 @@ static int decode_frame(AVCodecContext *avctx,
     ret = -1;
     goto the_end;
 }
+#endif
 
+#ifdef CONFIG_ENCODERS
 static void png_write_chunk(uint8_t **f, uint32_t tag,
                             const uint8_t *buf, int length)
 {
@@ -736,6 +745,7 @@ static int png_write_row(PNGContext *s, const uint8_t *data, int size)
     }
     return 0;
 }
+#endif /* CONFIG_ENCODERS */
 
 static int common_init(AVCodecContext *avctx){
     PNGContext *s = avctx->priv_data;
@@ -747,6 +757,7 @@ static int common_init(AVCodecContext *avctx){
     return 0;
 }
 
+#ifdef CONFIG_ENCODERS
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     PNGContext *s = avctx->priv_data;
     AVFrame *pict = data;
@@ -920,7 +931,9 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     ret = -1;
     goto the_end;
 }
+#endif
 
+#ifdef CONFIG_PNG_DECODER
 AVCodec png_decoder = {
     "png",
     CODEC_TYPE_VIDEO,
@@ -933,6 +946,7 @@ AVCodec png_decoder = {
     0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
     NULL
 };
+#endif
 
 #ifdef CONFIG_PNG_ENCODER
 AVCodec png_encoder = {

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 6204cf7975ec1fdad8e1b217fccddcec9b4277c9..f419f43be5865dd713ecd75bc19d89cc27c7c123 100644 (file)
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -164,7 +164,7 @@ static int raw_close_decoder(AVCodecContext *avctx)
 }
 
 /* RAW Encoder Implementation */
-
+#ifdef CONFIG_RAWVIDEO_ENCODER
 static int raw_init_encoder(AVCodecContext *avctx)
 {
     avctx->coded_frame = (AVFrame *)avctx->priv_data;
@@ -182,7 +182,6 @@ static int raw_encode(AVCodecContext *avctx,
                                                avctx->height, frame, buf_size);
 }
 
-#ifdef CONFIG_RAWVIDEO_ENCODER
 AVCodec rawvideo_encoder = {
     "rawvideo",
     CODEC_TYPE_VIDEO,

diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index 00a81dd166119e16337bd771c85199287d58d7cc..5b7d79c8584708b00ee8d82785273f55a8e71033 100644 (file)
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -406,6 +406,7 @@ static int predictor_calc_error(int *k, int *state, int order, int error)
     return x;
 }
 
+#ifdef CONFIG_ENCODERS
 // Heavily modified Levinson-Durbin algorithm which
 // copes better with quantization, and calculates the
 // actual whitened result as it goes.
@@ -476,6 +477,7 @@ static void modified_levinson_durbin(int *window, int window_entries,
 
     av_free(state);
 }
+#endif /* CONFIG_ENCODERS */
 
 static int samplerate_table[] =
     { 44100, 22050, 11025, 96000, 48000, 32000, 24000, 16000, 8000 };
@@ -746,6 +748,7 @@ static int sonic_encode_frame(AVCodecContext *avctx,
 }
 #endif //CONFIG_ENCODERS
 
+#ifdef CONFIG_DECODERS
 static int sonic_decode_init(AVCodecContext *avctx)
 {
     SonicContext *s = avctx->priv_data;
@@ -936,6 +939,7 @@ static int sonic_decode_frame(AVCodecContext *avctx,
 
     return (get_bits_count(&gb)+7)/8;
 }
+#endif
 
 #ifdef CONFIG_ENCODERS
 AVCodec sonic_encoder = {

diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c
index caa6fcb4efc4ca2d58a07123b4f24a1d8634e035..4f6a53fda4b0673e50f3aeeef8dc44bc05baa831 100644 (file)
--- a/libavcodec/svq1.c
+++ b/libavcodec/svq1.c
@@ -617,6 +617,7 @@ static uint16_t svq1_component_checksum (uint16_t *pixels, int pitch,
 }
 #endif
 
+#ifdef CONFIG_DECODERS
 static void svq1_parse_string (GetBitContext *bitbuf, uint8_t *out) {
   uint8_t seed;
   int     i;
@@ -879,7 +880,9 @@ static int svq1_decode_end(AVCodecContext *avctx)
     MPV_common_end(s);
     return 0;
 }
+#endif /* CONFIG_DECODERS */
 
+#ifdef CONFIG_ENCODERS
 static void svq1_write_header(SVQ1Context *s, int frame_type)
 {
     int i;
@@ -1081,7 +1084,6 @@ static int encode_block(SVQ1Context *s, uint8_t *src, uint8_t *ref, uint8_t *dec
     return best_score;
 }
 
-#ifdef CONFIG_ENCODERS
 
 static int svq1_encode_plane(SVQ1Context *s, int plane, unsigned char *src_plane, unsigned char *ref_plane, unsigned char *decoded_plane,
     int width, int height, int src_stride, int stride)
@@ -1395,6 +1397,7 @@ static int svq1_encode_end(AVCodecContext *avctx)
 
 #endif //CONFIG_ENCODERS
 
+#ifdef CONFIG_DECODERS
 AVCodec svq1_decoder = {
     "svq1",
     CODEC_TYPE_VIDEO,
@@ -1408,6 +1411,7 @@ AVCodec svq1_decoder = {
     .flush= ff_mpeg_flush,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV410P, -1},
 };
+#endif
 
 #ifdef CONFIG_ENCODERS