Imported Upstream version 6.1

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

diff --git a/libavcodec/xfacedec.c b/libavcodec/xfacedec.c
index f15bc2d..378d6ae 100644 (file)
--- a/libavcodec/xfacedec.c
+++ b/libavcodec/xfacedec.c
@@ -24,11 +24,9 @@
  * X-Face decoder, based on libcompface, by James Ashton.
  */
 
-#include "libavutil/pixdesc.h"
 #include "avcodec.h"
-#include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "xface.h"
 
 static int pop_integer(BigInt *b, const ProbRange *pranges)
@@ -177,7 +175,7 @@ static int xface_decode_frame(AVCodecContext *avctx, AVFrame *frame,
 
 const FFCodec ff_xface_decoder = {
     .p.name         = "xface",
-    .p.long_name    = NULL_IF_CONFIG_SMALL("X-face image"),
+    CODEC_LONG_NAME("X-face image"),
     .p.type         = AVMEDIA_TYPE_VIDEO,
     .p.id           = AV_CODEC_ID_XFACE,
     .p.capabilities = AV_CODEC_CAP_DR1,
@@ -185,5 +183,4 @@ const FFCodec ff_xface_decoder = {
     .init           = xface_decode_init,
     FF_CODEC_DECODE_CB(xface_decode_frame),
     .p.pix_fmts     = (const enum AVPixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE },
-    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
 };