Use AV_GCC_VERSION_AT_LEAST() to simplify gcc version checks.

[ffmpeg] / libavcodec / 4xm.c

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index d833a3b186c7239442616dacdd83a69ef9ef4fb7..0fc7a2e6d8c5ce7e4d79e99401968de03496eea4 100644 (file)
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
 #include "bytestream.h"
 
 //#undef NDEBUG
@@ -235,7 +235,7 @@ static void idct(DCTELEM block[64]){
     }
 }
 
-static void init_vlcs(FourXContext *f){
+static av_cold void init_vlcs(FourXContext *f){
     int i;
 
     for(i=0; i<8; i++){
@@ -405,7 +405,7 @@ static int decode_p_frame(FourXContext *f, const uint8_t *buf, int length){
 
 /**
  * decode block and dequantize.
- * Note this is allmost identical to mjpeg
+ * Note this is almost identical to MJPEG.
  */
 static int decode_i_block(FourXContext *f, DCTELEM *block){
     int code, i, j, level, val;
@@ -756,15 +756,15 @@ static int decode_frame(AVCodecContext *avctx,
     }
 
     if(frame_4cc == ff_get_fourcc("ifr2")){
-        p->pict_type= I_TYPE;
+        p->pict_type= FF_I_TYPE;
         if(decode_i2_frame(f, buf-4, frame_size) < 0)
             return -1;
     }else if(frame_4cc == ff_get_fourcc("ifrm")){
-        p->pict_type= I_TYPE;
+        p->pict_type= FF_I_TYPE;
         if(decode_i_frame(f, buf, frame_size) < 0)
             return -1;
     }else if(frame_4cc == ff_get_fourcc("pfrm") || frame_4cc == ff_get_fourcc("pfr2")){
-        p->pict_type= P_TYPE;
+        p->pict_type= FF_P_TYPE;
         if(decode_p_frame(f, buf, frame_size) < 0)
             return -1;
     }else if(frame_4cc == ff_get_fourcc("snd_")){
@@ -773,7 +773,7 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "ignoring unknown chunk length:%d\n", buf_size);
     }
 
-    p->key_frame= p->pict_type == I_TYPE;
+    p->key_frame= p->pict_type == FF_I_TYPE;
 
     *picture= *p;
     *data_size = sizeof(AVPicture);
@@ -792,7 +792,7 @@ static void common_init(AVCodecContext *avctx){
     f->avctx= avctx;
 }
 
-static int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx){
     FourXContext * const f = avctx->priv_data;
 
     if(avctx->extradata_size != 4 || !avctx->extradata) {
@@ -811,7 +811,7 @@ static int decode_init(AVCodecContext *avctx){
 }
 
 
-static int decode_end(AVCodecContext *avctx){
+static av_cold int decode_end(AVCodecContext *avctx){
     FourXContext * const f = avctx->priv_data;
     int i;
 
@@ -836,5 +836,6 @@ AVCodec fourxm_decoder = {
     decode_end,
     decode_frame,
     /*CODEC_CAP_DR1,*/
+    .long_name = NULL_IF_CONFIG_SMALL("4X Movie"),
 };