Skip over unknown extended_content_header tags.

[ffmpeg] / libavformat / c93.c

diff --git a/libavformat/c93.c b/libavformat/c93.c
index 369ae8e01ee1377619cb2d8fcde3188f9076cb16..996012f6edd7aba2bd9acf457e12514f439c5328 100644 (file)
--- a/libavformat/c93.c
+++ b/libavformat/c93.c
@@ -56,7 +56,7 @@ static int read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
     AVStream *video;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     C93DemuxContext *c93 = s->priv_data;
     int i;
     int framecount = 0;
@@ -77,7 +77,7 @@ static int read_header(AVFormatContext *s,
 
     video = av_new_stream(s, 0);
     if (!video)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
 
     video->codec->codec_type = CODEC_TYPE_VIDEO;
     video->codec->codec_id = CODEC_ID_C93;
@@ -101,7 +101,7 @@ static int read_header(AVFormatContext *s,
 
 static int read_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     C93DemuxContext *c93 = s->priv_data;
     C93BlockRecord *br = &c93->block_records[c93->current_block];
     int datasize;
@@ -115,7 +115,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
             if (!c93->audio) {
                 c93->audio = av_new_stream(s, 1);
                 if (!c93->audio)
-                    return AVERROR_NOMEM;
+                    return AVERROR(ENOMEM);
                 c93->audio->codec->codec_type = CODEC_TYPE_AUDIO;
             }
             url_fskip(pb, 26); /* VOC header */
@@ -129,7 +129,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
     }
     if (c93->current_frame >= br->frames) {
         if (c93->current_block >= 511 || !br[1].length)
-            return AVERROR_IO;
+            return AVERROR(EIO);
         br++;
         c93->current_block++;
         c93->current_frame = 0;
@@ -154,7 +154,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
 
     ret = get_buffer(pb, pkt->data + 1, datasize);
     if (ret < datasize) {
-        ret = AVERROR_IO;
+        ret = AVERROR(EIO);
         goto fail;
     }
 
@@ -168,7 +168,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
         pkt->data[0] |= C93_HAS_PALETTE;
         ret = get_buffer(pb, pkt->data + pkt->size, datasize);
         if (ret < datasize) {
-            ret = AVERROR_IO;
+            ret = AVERROR(EIO);
             goto fail;
         }
         pkt->size += 768;