X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcljr.c;h=bb8ae2c7b52c2085c6add713f6c365f5d766a523;hb=e1f7cb7fa0aec465ec0c172d1b922aebced04cc2;hp=31bec631fda51bc2b403b985609876400920dd55;hpb=fbd4293df9b0c9a1076da74b8e7a86cae6efdfe1;p=ffmpeg

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 31bec631fda..bb8ae2c7b52 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -28,6 +28,10 @@
 #include "dsputil.h"
 #include "bitstream.h"
 
+/* Disable the encoder. */
+#undef CONFIG_CLJR_ENCODER
+#define CONFIG_CLJR_ENCODER 0
+
 typedef struct CLJRContext{
     AVCodecContext *avctx;
     AVFrame picture;
@@ -81,7 +85,7 @@ static int decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-#if 0
+#if 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;
@@ -105,14 +109,14 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
 }
 #endif
 
-static void common_init(AVCodecContext *avctx){
+static av_cold void common_init(AVCodecContext *avctx){
     CLJRContext * const a = avctx->priv_data;
 
     avctx->coded_frame= (AVFrame*)&a->picture;
     a->avctx= avctx;
 }
 
-static int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx){
 
     common_init(avctx);
 
@@ -121,8 +125,8 @@ static int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
-#if 0
-static int encode_init(AVCodecContext *avctx){
+#if CONFIG_CLJR_ENCODER
+static av_cold int encode_init(AVCodecContext *avctx){
 
     common_init(avctx);
 
@@ -140,10 +144,10 @@ AVCodec cljr_decoder = {
     NULL,
     decode_frame,
     CODEC_CAP_DR1,
+    .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
-#if 0
-#ifdef CONFIG_ENCODERS
 
+#if CONFIG_CLJR_ENCODER
 AVCodec cljr_encoder = {
     "cljr",
     CODEC_TYPE_VIDEO,
@@ -152,7 +156,6 @@ AVCodec cljr_encoder = {
     encode_init,
     encode_frame,
     //encode_end,
+    .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
-
-#endif //CONFIG_ENCODERS
 #endif