Motion Pixels MVI Demuxer.

[ffmpeg] / libavformat / vocdec.c

diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 58f79d73c6d1e2dc09092144723fc1fedd056de7..06ef0c37bf9a4b3382f12f726cb9abfe04b6a403 100644 (file)
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -39,7 +39,7 @@ static int voc_probe(AVProbeData *p)
 static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
     voc_dec_context_t *voc = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     int header_size;
     AVStream *st;
 
@@ -47,7 +47,7 @@ static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap)
     header_size = get_le16(pb) - 22;
     if (header_size != 4) {
         av_log(s, AV_LOG_ERROR, "unknown header size: %d\n", header_size);
-        return AVERROR_NOTSUPP;
+        return AVERROR(ENOSYS);
     }
     url_fskip(pb, header_size);
     st = av_new_stream(s, 0);
@@ -64,7 +64,7 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
 {
     voc_dec_context_t *voc = s->priv_data;
     AVCodecContext *dec = st->codec;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     voc_type_t type;
     int size;
     int sample_rate = 0;
@@ -73,7 +73,7 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
     while (!voc->remaining_size) {
         type = get_byte(pb);
         if (type == VOC_TYPE_EOF)
-            return AVERROR_IO;
+            return AVERROR(EIO);
         voc->remaining_size = get_le24(pb);
         max_size -= 4;
 
@@ -136,7 +136,7 @@ static int voc_read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat voc_demuxer = {
     "voc",
-    "Creative Voice File format",
+    NULL_IF_CONFIG_SMALL("Creative Voice file format"),
     sizeof(voc_dec_context_t),
     voc_probe,
     voc_read_header,