[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec dv.c, 1.60, 1.61 mpegaudio.c, 1.22, 1.23 png.c, 1.11, 1.12 pnm.c, 1.10, 1.11 raw.c, 1.12, 1.13

Michael Niedermayer CVS michael
Tue May 10 22:39:13 CEST 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv3128

Modified Files:
	dv.c mpegaudio.c png.c pnm.c raw.c 
Log Message:
a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge net]


Index: dv.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dv.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- dv.c	18 Apr 2005 12:08:16 -0000	1.60
+++ dv.c	10 May 2005 20:39:11 -0000	1.61
@@ -942,6 +942,7 @@
     return s->sys->frame_size;
 }
 
+#ifdef CONFIG_DVVIDEO_ENCODER
 AVCodec dvvideo_encoder = {
     "dvvideo",
     CODEC_TYPE_VIDEO,
@@ -954,6 +955,7 @@
     CODEC_CAP_DR1,
     NULL
 };
+#endif // CONFIG_DVVIDEO_ENCODER
 
 AVCodec dvvideo_decoder = {
     "dvvideo",

Index: mpegaudio.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegaudio.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mpegaudio.c	24 Feb 2005 19:08:50 -0000	1.22
+++ mpegaudio.c	10 May 2005 20:39:11 -0000	1.23
@@ -785,6 +785,7 @@
     return 0;
 }
 
+#ifdef CONFIG_MP2_ENCODER
 AVCodec mp2_encoder = {
     "mp2",
     CODEC_TYPE_AUDIO,
@@ -795,5 +796,6 @@
     MPA_encode_close,
     NULL,
 };
+#endif // CONFIG_MP2_ENCODER
 
 #undef FIX

Index: png.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/png.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- png.c	23 Jan 2005 18:09:06 -0000	1.11
+++ png.c	10 May 2005 20:39:11 -0000	1.12
@@ -934,6 +934,7 @@
     NULL
 };
 
+#ifdef CONFIG_PNG_ENCODER
 AVCodec png_encoder = {
     "png",
     CODEC_TYPE_VIDEO,
@@ -944,4 +945,5 @@
     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

Index: pnm.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/pnm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pnm.c	23 Jan 2005 18:09:06 -0000	1.10
+++ pnm.c	10 May 2005 20:39:11 -0000	1.11
@@ -517,6 +517,7 @@
     ff_parse_close,
 };
 
+#ifdef CONFIG_PGM_ENCODER
 AVCodec pgm_encoder = {
     "pgm",
     CODEC_TYPE_VIDEO,
@@ -528,7 +529,9 @@
     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 @@
     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 @@
     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 @@
     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 @@
     pnm_decode_frame,
     .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, -1}, 
 };
+#endif // CONFIG_PAM_ENCODER

Index: raw.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/raw.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- raw.c	30 Nov 2004 21:50:16 -0000	1.12
+++ raw.c	10 May 2005 20:39:11 -0000	1.13
@@ -172,6 +172,7 @@
                                                avctx->height, frame, buf_size);
 }
 
+#ifdef CONFIG_RAWVIDEO_ENCODER
 AVCodec rawvideo_encoder = {
     "rawvideo",
     CODEC_TYPE_VIDEO,
@@ -180,6 +181,7 @@
     raw_init_encoder,
     raw_encode,
 };
+#endif // CONFIG_RAWVIDEO_ENCODER
 
 AVCodec rawvideo_decoder = {
     "rawvideo",





More information about the ffmpeg-cvslog mailing list