configure: Identify icc compiler with a less ambiguous pattern

[ffmpeg] / libavcodec / dxtory.c

diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index d11b942ff85ed7f8fc8bc02964f51295b1899280..30983f8056d3cb5611bc844551d1e25069785268 100644 (file)
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -21,11 +21,13 @@
  */
 
 #include "avcodec.h"
+#include "internal.h"
+#include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 
 static av_cold int decode_init(AVCodecContext *avctx)
 {
-    avctx->pix_fmt     = PIX_FMT_YUV420P;
+    avctx->pix_fmt     = AV_PIX_FMT_YUV420P;
     avctx->coded_frame = avcodec_alloc_frame();
     if (!avctx->coded_frame)
         return AVERROR(ENOMEM);
@@ -33,7 +35,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
     return 0;
 }
 
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
                         AVPacket *avpkt)
 {
     int h, w;
@@ -51,7 +53,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     }
 
     pic->reference = 0;
-    if ((ret = avctx->get_buffer(avctx, pic)) < 0)
+    if ((ret = ff_get_buffer(avctx, pic)) < 0)
         return ret;
 
     pic->pict_type = AV_PICTURE_TYPE_I;
@@ -69,8 +71,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     V  = pic->data[2];
     for (h = 0; h < avctx->height; h += 2) {
         for (w = 0; w < avctx->width; w += 2) {
-            AV_WN16A(Y1 + w, AV_RN16A(src));
-            AV_WN16A(Y2 + w, AV_RN16A(src + 2));
+            AV_COPY16(Y1 + w, src);
+            AV_COPY16(Y2 + w, src + 2);
             U[w >> 1] = src[4] + 0x80;
             V[w >> 1] = src[5] + 0x80;
             src += 6;
@@ -81,7 +83,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         V  += pic->linesize[2];
     }
 
-    *data_size      = sizeof(AVFrame);
+    *got_frame = 1;
     *(AVFrame*)data = *pic;
 
     return avpkt->size;