dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation

[ffmpeg] / libavformat / flic.c

diff --git a/libavformat/flic.c b/libavformat/flic.c
index 7edc46e2a7b2a2f37a0730c1c38b917a99ef2421..2eb6f057b40296faf95866490a427aef8222c917 100644 (file)
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -31,8 +31,8 @@
  * special FLIs from the PC games "Magic Carpet" and "X-COM: Terror from the Deep".
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/audioconvert.h"
 #include "avformat.h"
 #include "internal.h"
 
@@ -83,8 +83,7 @@ static int flic_probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int flic_read_header(AVFormatContext *s,
-                            AVFormatParameters *ap)
+static int flic_read_header(AVFormatContext *s)
 {
     FlicDemuxContext *flic = s->priv_data;
     AVIOContext *pb = s->pb;
@@ -111,7 +110,7 @@ static int flic_read_header(AVFormatContext *s,
         return AVERROR(ENOMEM);
     flic->video_stream_index = st->index;
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id = CODEC_ID_FLIC;
+    st->codec->codec_id = AV_CODEC_ID_FLIC;
     st->codec->codec_tag = 0;  /* no fourcc */
     st->codec->width = AV_RL16(&header[0x08]);
     st->codec->height = AV_RL16(&header[0x0A]);
@@ -155,7 +154,7 @@ static int flic_read_header(AVFormatContext *s,
         /* all audio frames are the same size, so use the size of the first chunk for block_align */
         ast->codec->block_align = AV_RL32(&preamble[0]);
         ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-        ast->codec->codec_id = CODEC_ID_PCM_U8;
+        ast->codec->codec_id = AV_CODEC_ID_PCM_U8;
         ast->codec->codec_tag = 0;
         ast->codec->sample_rate = FLIC_TFTD_SAMPLE_RATE;
         ast->codec->channels = 1;
@@ -263,7 +262,7 @@ static int flic_read_packet(AVFormatContext *s,
 
 AVInputFormat ff_flic_demuxer = {
     .name           = "flic",
-    .long_name      = NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation"),
     .priv_data_size = sizeof(FlicDemuxContext),
     .read_probe     = flic_probe,
     .read_header    = flic_read_header,