MPEGTS: Improve probe function

[ffmpeg] / libavformat / idroq.c

diff --git a/libavformat/idroq.c b/libavformat/idroq.c
index de28d1ef4ba5cfb53c80447c210ccb65cb26e842..801f3dc4500ef6918a1bd2d986797cd09a6abec5 100644 (file)
--- a/libavformat/idroq.c
+++ b/libavformat/idroq.c
@@ -1,5 +1,5 @@
 /*
- * Id RoQ (.roq) File Demuxer
+ * id RoQ (.roq) File Demuxer
  * Copyright (c) 2003 The ffmpeg Project
  *
  * This file is part of FFmpeg.
@@ -21,7 +21,7 @@
 
 /**
  * @file idroq.c
- * Id RoQ format file demuxer
+ * id RoQ format file demuxer
  * by Mike Melanson (melanson@pcisys.net)
  * for more information on the .roq file format, visit:
  *   http://www.csse.monash.edu.au/~timf/
@@ -69,7 +69,7 @@ static int roq_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
     RoqDemuxContext *roq = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVStream *st;
     unsigned char preamble[RoQ_CHUNK_PREAMBLE_SIZE];
     int i;
@@ -79,7 +79,7 @@ static int roq_read_header(AVFormatContext *s,
     /* get the main header */
     if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) !=
         RoQ_CHUNK_PREAMBLE_SIZE)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     roq->framerate = AV_RL16(&preamble[6]);
     roq->frame_pts_inc = 90000 / roq->framerate;
 
@@ -91,7 +91,7 @@ static int roq_read_header(AVFormatContext *s,
     for (i = 0; i < RoQ_CHUNKS_TO_SCAN; i++) {
         if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) !=
             RoQ_CHUNK_PREAMBLE_SIZE)
-            return AVERROR_IO;
+            return AVERROR(EIO);
 
         chunk_type = AV_RL16(&preamble[0]);
         chunk_size = AV_RL32(&preamble[2]);
@@ -102,7 +102,7 @@ static int roq_read_header(AVFormatContext *s,
             /* fetch the width and height; reuse the preamble bytes */
             if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) !=
                 RoQ_CHUNK_PREAMBLE_SIZE)
-                return AVERROR_IO;
+                return AVERROR(EIO);
             roq->width = AV_RL16(&preamble[0]);
             roq->height = AV_RL16(&preamble[2]);
             break;
@@ -174,7 +174,7 @@ static int roq_read_packet(AVFormatContext *s,
                            AVPacket *pkt)
 {
     RoqDemuxContext *roq = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     int ret = 0;
     unsigned int chunk_size;
     unsigned int chunk_type;
@@ -185,13 +185,13 @@ static int roq_read_packet(AVFormatContext *s,
 
     while (!packet_read) {
 
-        if (url_feof(&s->pb))
-            return AVERROR_IO;
+        if (url_feof(s->pb))
+            return AVERROR(EIO);
 
         /* get the next chunk preamble */
         if ((ret = get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE)) !=
             RoQ_CHUNK_PREAMBLE_SIZE)
-            return AVERROR_IO;
+            return AVERROR(EIO);
 
         chunk_type = AV_RL16(&preamble[0]);
         chunk_size = AV_RL32(&preamble[2]);
@@ -212,7 +212,7 @@ static int roq_read_packet(AVFormatContext *s,
             url_fseek(pb, codebook_size, SEEK_CUR);
             if (get_buffer(pb, preamble, RoQ_CHUNK_PREAMBLE_SIZE) !=
                 RoQ_CHUNK_PREAMBLE_SIZE)
-                return AVERROR_IO;
+                return AVERROR(EIO);
             chunk_size = AV_RL32(&preamble[2]) + RoQ_CHUNK_PREAMBLE_SIZE * 2 +
                 codebook_size;
 
@@ -222,7 +222,7 @@ static int roq_read_packet(AVFormatContext *s,
             /* load up the packet */
             ret= av_get_packet(pb, pkt, chunk_size);
             if (ret != chunk_size)
-                return AVERROR_IO;
+                return AVERROR(EIO);
             pkt->stream_index = roq->video_stream_index;
             pkt->pts = roq->video_pts;
 
@@ -235,7 +235,7 @@ static int roq_read_packet(AVFormatContext *s,
         case RoQ_QUAD_VQ:
             /* load up the packet */
             if (av_new_packet(pkt, chunk_size + RoQ_CHUNK_PREAMBLE_SIZE))
-                return AVERROR_IO;
+                return AVERROR(EIO);
             /* copy over preamble */
             memcpy(pkt->data, preamble, RoQ_CHUNK_PREAMBLE_SIZE);
 
@@ -255,7 +255,7 @@ static int roq_read_packet(AVFormatContext *s,
             ret = get_buffer(pb, pkt->data + RoQ_CHUNK_PREAMBLE_SIZE,
                 chunk_size);
             if (ret != chunk_size)
-                ret = AVERROR_IO;
+                ret = AVERROR(EIO);
 
             packet_read = 1;
             break;
@@ -270,19 +270,11 @@ static int roq_read_packet(AVFormatContext *s,
     return ret;
 }
 
-static int roq_read_close(AVFormatContext *s)
-{
-//    RoqDemuxContext *roq = s->priv_data;
-
-    return 0;
-}
-
 AVInputFormat roq_demuxer = {
     "RoQ",
-    "Id RoQ format",
+    NULL_IF_CONFIG_SMALL("id RoQ format"),
     sizeof(RoqDemuxContext),
     roq_probe,
     roq_read_header,
     roq_read_packet,
-    roq_read_close,
 };