avcodec: Switch AVCPBProperties to 64bits

[ffmpeg] / libavformat / daudenc.c

diff --git a/libavformat/daudenc.c b/libavformat/daudenc.c
index 15a5afdfc967d8f113629a39a381fe658f23dedf..b489659a80b94e123ad82259dd53457da00f7472 100644 (file)
--- 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
@@ -48,7 +48,7 @@ AVOutputFormat ff_daud_muxer = {
     .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,
 };