dsputil: Move APE-specific bits into apedsp

[ffmpeg] / libavcodec / escape130.c

diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c
index 3e3f7e1565f3775f8d69c159cc5f82bf82893342..bc865a3b21e42d74d30b01de48677d9dddb9c047 100644 (file)
--- a/libavcodec/escape130.c
+++ b/libavcodec/escape130.c
@@ -115,7 +115,7 @@ const uint8_t chroma_vals[] = {
 static av_cold int escape130_decode_init(AVCodecContext *avctx)
 {
     Escape130Context *s = avctx->priv_data;
-    avctx->pix_fmt = PIX_FMT_YUV420P;
+    avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 
     if ((avctx->width & 1) || (avctx->height & 1)) {
         av_log(avctx, AV_LOG_ERROR,
@@ -345,6 +345,7 @@ static int escape130_decode_frame(AVCodecContext *avctx, void *data,
 
 AVCodec ff_escape130_decoder = {
     .name           = "escape130",
+    .long_name      = NULL_IF_CONFIG_SMALL("Escape 130"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_ESCAPE130,
     .priv_data_size = sizeof(Escape130Context),
@@ -352,5 +353,4 @@ AVCodec ff_escape130_decoder = {
     .close          = escape130_decode_close,
     .decode         = escape130_decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .long_name      = NULL_IF_CONFIG_SMALL("Escape 130"),
 };