X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcljr.c;h=ddc00583d13fce8faf0856c96174e3dbbfee6818;hb=33ac07ea08f47beebf51e43a4a2bc7fe81a9ad90;hp=6b76411ac70dc0ff9d0b113a6d2a610a69835040;hpb=1a2c94cb69ebd2c31383552e6b32891977675627;p=ffmpeg

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 6b76411ac70..ddc00583d13 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -25,7 +25,8 @@
  */
 
 #include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
+#include "bitstream.h"
 
 typedef struct CLJRContext{
     AVCodecContext *avctx;
@@ -52,7 +53,7 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
 
     init_get_bits(&a->gb, buf, buf_size);
@@ -89,7 +90,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     int mb_x, mb_y;
 
     *p = *pict;
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
 
     emms_c();
@@ -104,14 +105,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,7 +122,7 @@ static int decode_init(AVCodecContext *avctx){
 }
 
 #if 0
-static int encode_init(AVCodecContext *avctx){
+static av_cold int encode_init(AVCodecContext *avctx){
 
     common_init(avctx);
 
@@ -139,6 +140,7 @@ AVCodec cljr_decoder = {
     NULL,
     decode_frame,
     CODEC_CAP_DR1,
+    .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
 #if 0
 #ifdef CONFIG_ENCODERS
@@ -151,6 +153,7 @@ AVCodec cljr_encoder = {
     encode_init,
     encode_frame,
     //encode_end,
+    .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
 
 #endif //CONFIG_ENCODERS