Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavcodec / msrle.c

diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index f9d7141..51e843e 100644 (file)
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -28,14 +28,11 @@
  * The MS RLE decoder outputs PAL8 colorspace data.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "msrledec.h"
 #include "libavutil/imgutils.h"
 
@@ -98,7 +95,14 @@ static int msrle_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
         return ret;
 
     if (avctx->bits_per_coded_sample > 1 && avctx->bits_per_coded_sample <= 8) {
-        s->frame->palette_has_changed = ff_copy_palette(s->pal, avpkt, avctx);
+#if FF_API_PALETTE_HAS_CHANGED
+FF_DISABLE_DEPRECATION_WARNINGS
+        s->frame->palette_has_changed =
+#endif
+        ff_copy_palette(s->pal, avpkt, avctx);
+#if FF_API_PALETTE_HAS_CHANGED
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
 
         /* make the palette available */
         memcpy(s->frame->data[1], s->pal, AVPALETTE_SIZE);
@@ -161,7 +165,7 @@ static av_cold int msrle_decode_end(AVCodecContext *avctx)
 
 const FFCodec ff_msrle_decoder = {
     .p.name         = "msrle",
-    .p.long_name    = NULL_IF_CONFIG_SMALL("Microsoft RLE"),
+    CODEC_LONG_NAME("Microsoft RLE"),
     .p.type         = AVMEDIA_TYPE_VIDEO,
     .p.id           = AV_CODEC_ID_MSRLE,
     .priv_data_size = sizeof(MsrleContext),
@@ -170,5 +174,4 @@ const FFCodec ff_msrle_decoder = {
     FF_CODEC_DECODE_CB(msrle_decode_frame),
     .flush          = msrle_decode_flush,
     .p.capabilities = AV_CODEC_CAP_DR1,
-    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
 };