avcodec/zmbvenc: Simplify setting keyframe flag

[ffmpeg] / libavformat / daudenc.c

diff --git a/libavformat/daudenc.c b/libavformat/daudenc.c
index 0d8d830a67394c20545deb5efcfacd583e4efa76..183a08ba30d87ece5471fed7aaaee27219b403b6 100644 (file)
--- a/libavformat/daudenc.c
+++ b/libavformat/daudenc.c
@@ -25,7 +25,7 @@ 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,7 +42,7 @@ 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",