Surround some encoding-specific functions with the appropriate

encoding-specific #ifdef.

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

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index fa2cda5..21a3e50 100644 (file)
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -82,6 +82,7 @@ static int decode_frame(AVCodecContext *avctx,
 }
 
 #if 0
+#ifdef CONFIG_CLJR_ENCODER
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     CLJRContext * const a = avctx->priv_data;
     AVFrame *pict = data;
@@ -104,6 +105,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     return size*4;
 }
 #endif
+#endif
 
 static av_cold void common_init(AVCodecContext *avctx){
     CLJRContext * const a = avctx->priv_data;
@@ -122,6 +124,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
 }
 
 #if 0
+#ifdef CONFIG_CLJR_ENCODER
 static av_cold int encode_init(AVCodecContext *avctx){
 
     common_init(avctx);
@@ -129,6 +132,7 @@ static av_cold int encode_init(AVCodecContext *avctx){
     return 0;
 }
 #endif
+#endif
 
 AVCodec cljr_decoder = {
     "cljr",

diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 5022fe7..3c6cee5 100644 (file)
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -114,6 +114,7 @@ static int decode_frame(AVCodecContext *avctx,
 }
 
 #if 0
+#ifdef CONFIG_VCR1_ENCODER
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     VCR1Context * const a = avctx->priv_data;
     AVFrame *pict = data;
@@ -136,6 +137,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     return size*4;
 }
 #endif
+#endif
 
 static av_cold void common_init(AVCodecContext *avctx){
     VCR1Context * const a = avctx->priv_data;
@@ -154,6 +156,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
 }
 
 #if 0
+#ifdef CONFIG_VCR1_ENCODER
 static av_cold int encode_init(AVCodecContext *avctx){
 
     common_init(avctx);
@@ -161,6 +164,7 @@ static av_cold int encode_init(AVCodecContext *avctx){
     return 0;
 }
 #endif
+#endif
 
 AVCodec vcr1_decoder = {
     "vcr1",