a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge...

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4213 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 94440ed5cdf4661422a2cd3422010a05ee0c2746..bc750bcbc6abb60b61a827e58c4ce73ce2e66665 100644 (file)
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -942,6 +942,7 @@ static int dvvideo_encode_frame(AVCodecContext *c, uint8_t *buf, int buf_size,
     return s->sys->frame_size;
 }
 
+#ifdef CONFIG_DVVIDEO_ENCODER
 AVCodec dvvideo_encoder = {
     "dvvideo",
     CODEC_TYPE_VIDEO,
@@ -954,6 +955,7 @@ AVCodec dvvideo_encoder = {
     CODEC_CAP_DR1,
     NULL
 };
+#endif // CONFIG_DVVIDEO_ENCODER
 
 AVCodec dvvideo_decoder = {
     "dvvideo",

diff --git a/libavcodec/mpegaudio.c b/libavcodec/mpegaudio.c
index d521acc588c99df03a1bac48861e1183f86a06b3..190aa1590ce3d8277b5a775e0a788c503dae6780 100644 (file)
--- a/libavcodec/mpegaudio.c
+++ b/libavcodec/mpegaudio.c
@@ -785,6 +785,7 @@ static int MPA_encode_close(AVCodecContext *avctx)
     return 0;
 }
 
+#ifdef CONFIG_MP2_ENCODER
 AVCodec mp2_encoder = {
     "mp2",
     CODEC_TYPE_AUDIO,
@@ -795,5 +796,6 @@ AVCodec mp2_encoder = {
     MPA_encode_close,
     NULL,
 };
+#endif // CONFIG_MP2_ENCODER
 
 #undef FIX

diff --git a/libavcodec/png.c b/libavcodec/png.c
index 637a2291713ca37fb764a11d2fb6e0d556e19d39..fd555ae8cd244cd24019f9617aa662598deaefd7 100644 (file)
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -934,6 +934,7 @@ AVCodec png_decoder = {
     NULL
 };
 
+#ifdef CONFIG_PNG_ENCODER
 AVCodec png_encoder = {
     "png",
     CODEC_TYPE_VIDEO,
@@ -944,4 +945,5 @@ AVCodec png_encoder = {
     NULL, //encode_end,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA32, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, -1},
 };
+#endif // CONFIG_PNG_ENCODER
 #endif

diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c
index 3751d114aa434a4ce016acb31ed81e90e70b09a0..30a65701699f42a9c54d689806943c083fe172d5 100644 (file)
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@@ -517,6 +517,7 @@ AVCodecParser pnm_parser = {
     ff_parse_close,
 };
 
+#ifdef CONFIG_PGM_ENCODER
 AVCodec pgm_encoder = {
     "pgm",
     CODEC_TYPE_VIDEO,
@@ -528,7 +529,9 @@ AVCodec pgm_encoder = {
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, -1}, 
 };
+#endif // CONFIG_PGM_ENCODER
 
+#ifdef CONFIG_PGMYUV_ENCODER
 AVCodec pgmyuv_encoder = {
     "pgmyuv",
     CODEC_TYPE_VIDEO,
@@ -540,7 +543,9 @@ AVCodec pgmyuv_encoder = {
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 
 };
+#endif // CONFIG_PGMYUV_ENCODER
 
+#ifdef CONFIG_PPM_ENCODER
 AVCodec ppm_encoder = {
     "ppm",
     CODEC_TYPE_VIDEO,
@@ -552,7 +557,9 @@ AVCodec ppm_encoder = {
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, -1}, 
 };
+#endif // CONFIG_PPM_ENCODER
 
+#ifdef CONFIG_PBM_ENCODER
 AVCodec pbm_encoder = {
     "pbm",
     CODEC_TYPE_VIDEO,
@@ -564,7 +571,9 @@ AVCodec pbm_encoder = {
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, -1}, 
 };
+#endif // CONFIG_PBM_ENCODER
 
+#ifdef CONFIG_PAM_ENCODER
 AVCodec pam_encoder = {
     "pam",
     CODEC_TYPE_VIDEO,
@@ -576,3 +585,4 @@ AVCodec pam_encoder = {
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, -1}, 
 };
+#endif // CONFIG_PAM_ENCODER

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 957a809d8ba6f1c816392b4c730ec4e2f1e6bf83..e2614e5030ee03bddc857f419c0672c75d01825a 100644 (file)
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -172,6 +172,7 @@ static int raw_encode(AVCodecContext *avctx,
                                                avctx->height, frame, buf_size);
 }
 
+#ifdef CONFIG_RAWVIDEO_ENCODER
 AVCodec rawvideo_encoder = {
     "rawvideo",
     CODEC_TYPE_VIDEO,
@@ -180,6 +181,7 @@ AVCodec rawvideo_encoder = {
     raw_init_encoder,
     raw_encode,
 };
+#endif // CONFIG_RAWVIDEO_ENCODER
 
 AVCodec rawvideo_decoder = {
     "rawvideo",