1. ffmpeg
  2. Commit c7ac9449bad31d16dbb34d09218584b082c3be65
Browse code

Disable encoders by undefining CONFIG_FOO_ENCODER once instead of littering the code with preprocessor directives.

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

Diego Biurrun authored on 2008/09/03 21:43:18
Showing 2 changed files
libavcodec/cljr.c
History View file @ c7ac944
... ... 
@@ -28,6 +28,9 @@
28 28 
 #include "dsputil.h"
29 29 
 #include "bitstream.h"
30 30
31 
+/* Disable the encoder. */
32 
+#undef CONFIG_CLJR_ENCODER
33 
+
31 34 
 typedef struct CLJRContext{
32 35 
     AVCodecContext *avctx;
33 36 
     AVFrame picture;
... ... 
@@ -81,7 +84,6 @@ static int decode_frame(AVCodecContext *avctx,
81 81 
     return buf_size;
82 82 
 }
83 83
84 
-#if 0
85 84 
 #ifdef CONFIG_CLJR_ENCODER
86 85 
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
87 86 
     CLJRContext * const a = avctx->priv_data;
... ... 
@@ -105,7 +107,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
105 105 
     return size*4;
106 106 
 }
107 107 
 #endif
108 
-#endif
109 108
110 109 
 static av_cold void common_init(AVCodecContext *avctx){
111 110 
     CLJRContext * const a = avctx->priv_data;
... ... 
@@ -123,7 +124,6 @@ static av_cold int decode_init(AVCodecContext *avctx){
123 123 
     return 0;
124 124 
 }
125 125
126 
-#if 0
127 126 
 #ifdef CONFIG_CLJR_ENCODER
128 127 
 static av_cold int encode_init(AVCodecContext *avctx){
129 128
... ... 
@@ -132,7 +132,6 @@ static av_cold int encode_init(AVCodecContext *avctx){
132 132 
     return 0;
133 133 
 }
134 134 
 #endif
135 
-#endif
136 135
137 136 
 AVCodec cljr_decoder = {
138 137 
     "cljr",
... ... 
@@ -146,7 +145,7 @@ AVCodec cljr_decoder = {
146 146 
     CODEC_CAP_DR1,
147 147 
     .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
148 148 
 };
149 
-#if 0
149 
+
150 150 
 #ifdef CONFIG_CLJR_ENCODER
151 151 
 AVCodec cljr_encoder = {
152 152 
     "cljr",
... ... 
@@ -159,4 +158,3 @@ AVCodec cljr_encoder = {
159 159 
     .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
160 160 
 };
161 161 
 #endif
162 
-#endif
libavcodec/vcr1.c
History View file @ c7ac944
... ... 
@@ -30,6 +30,9 @@
30 30 
 //#undef NDEBUG
31 31 
 //#include <assert.h>
32 32
33 
+/* Disable the encoder. */
34 
+#undef CONFIG_VCR1_ENCODER
35 
+
33 36 
 typedef struct VCR1Context{
34 37 
     AVCodecContext *avctx;
35 38 
     AVFrame picture;
... ... 
@@ -113,7 +116,6 @@ static int decode_frame(AVCodecContext *avctx,
113 113 
     return buf_size;
114 114 
 }
115 115
116 
-#if 0
117 116 
 #ifdef CONFIG_VCR1_ENCODER
118 117 
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
119 118 
     VCR1Context * const a = avctx->priv_data;
... ... 
@@ -137,7 +139,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
137 137 
     return size*4;
138 138 
 }
139 139 
 #endif
140 
-#endif
141 140
142 141 
 static av_cold void common_init(AVCodecContext *avctx){
143 142 
     VCR1Context * const a = avctx->priv_data;
... ... 
@@ -155,7 +156,6 @@ static av_cold int decode_init(AVCodecContext *avctx){
155 155 
     return 0;
156 156 
 }
157 157
158 
-#if 0
159 158 
 #ifdef CONFIG_VCR1_ENCODER
160 159 
 static av_cold int encode_init(AVCodecContext *avctx){
161 160
... ... 
@@ -164,7 +164,6 @@ static av_cold int encode_init(AVCodecContext *avctx){
164 164 
     return 0;
165 165 
 }
166 166 
 #endif
167 
-#endif
168 167
169 168 
 AVCodec vcr1_decoder = {
170 169 
     "vcr1",
... ... 
@@ -178,7 +177,7 @@ AVCodec vcr1_decoder = {
178 178 
     CODEC_CAP_DR1,
179 179 
     .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
180 180 
 };
181 
-#if 0
181 
+
182 182 
 #ifdef CONFIG_VCR1_ENCODER
183 183 
 AVCodec vcr1_encoder = {
184 184 
     "vcr1",
... ... 
@@ -191,4 +190,3 @@ AVCodec vcr1_encoder = {
191 191 
     .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
192 192 
 };
193 193 
 #endif
194 
-#endif