X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fdaudenc.c;h=183a08ba30d87ece5471fed7aaaee27219b403b6;hb=bc70684e74a185d7b80c8b80bdedda659cb581b8;hp=15a5afdfc967d8f113629a39a381fe658f23dedf;hpb=23ce57af3ad684363881cdd66d5724f40963a65c;p=ffmpeg

diff --git a/libavformat/daudenc.c b/libavformat/daudenc.c
index 15a5afdfc96..183a08ba30d 100644
--- a/libavformat/daudenc.c
+++ b/libavformat/daudenc.c
@@ -21,11 +21,11 @@
 
 #include "avformat.h"
 
-static int daud_write_header(struct AVFormatContext *s)
+static int daud_init(struct AVFormatContext *s)
 {
     AVCodecParameters *par = s->streams[0]->codecpar;
     if (par->channels!=6 || par->sample_rate!=96000)
-        return -1;
+        return AVERROR(EINVAL);
     return 0;
 }
 
@@ -34,7 +34,7 @@ static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     if (pkt->size > 65535) {
         av_log(s, AV_LOG_ERROR,
                "Packet size too large for s302m. (%d > 65535)\n", pkt->size);
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
     avio_wb16(s->pb, pkt->size);
     avio_wb16(s->pb, 0x8010); // unknown
@@ -42,13 +42,13 @@ static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat ff_daud_muxer = {
+const AVOutputFormat ff_daud_muxer = {
     .name         = "daud",
     .long_name    = NULL_IF_CONFIG_SMALL("D-Cinema audio"),
     .extensions   = "302",
     .audio_codec  = AV_CODEC_ID_PCM_S24DAUD,
     .video_codec  = AV_CODEC_ID_NONE,
-    .write_header = daud_write_header,
+    .init         = daud_init,
     .write_packet = daud_write_packet,
     .flags        = AVFMT_NOTIMESTAMPS,
 };