Generic metadata API.

[ffmpeg] / libavcodec / cljr.c

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index ddc00583d13fce8faf0856c96174e3dbbfee6818..c80af01f0d8f8cca9f1ccbdd977077a6ea73913a 100644 (file)
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -28,6 +28,9 @@
 #include "dsputil.h"
 #include "bitstream.h"
 
+/* Disable the encoder. */
+#undef CONFIG_CLJR_ENCODER
+
 typedef struct CLJRContext{
     AVCodecContext *avctx;
     AVFrame picture;
@@ -81,7 +84,7 @@ static int decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-#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;
@@ -121,7 +124,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
-#if 0
+#ifdef CONFIG_CLJR_ENCODER
 static av_cold int encode_init(AVCodecContext *avctx){
 
     common_init(avctx);
@@ -142,9 +145,8 @@ AVCodec cljr_decoder = {
     CODEC_CAP_DR1,
     .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
-#if 0
-#ifdef CONFIG_ENCODERS
 
+#ifdef CONFIG_CLJR_ENCODER
 AVCodec cljr_encoder = {
     "cljr",
     CODEC_TYPE_VIDEO,
@@ -155,6 +157,4 @@ AVCodec cljr_encoder = {
     //encode_end,
     .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
-
-#endif //CONFIG_ENCODERS
 #endif