seek-test: use standard format specifiers in snprintf()

[ffmpeg] / libavformat / iv8.c

diff --git a/libavformat/iv8.c b/libavformat/iv8.c
index 1f3dfe2f828906093d7b69ab094fe56ff13a9322..fa77f824716f494b3a258081f7dfc6a3933ec06f 100644 (file)
--- a/libavformat/iv8.c
+++ b/libavformat/iv8.c
@@ -19,11 +19,12 @@
  */
 
 #include "avformat.h"
+#include "internal.h"
 
 
 static int probe(AVProbeData *p)
 {
-    // the single file i have starts with that, i dont know if others do too
+    // the single file I have starts with that, I do not know if others do, too
     if(   p->buf[0] == 1
        && p->buf[1] == 1
        && p->buf[2] == 3
@@ -40,14 +41,14 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
     AVStream *st;
 
-    st = av_new_stream(s, 0);
+    st = avformat_new_stream(s, NULL);
     if (!st)
         return AVERROR(ENOMEM);
 
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     st->codec->codec_id = CODEC_ID_MPEG4;
     st->need_parsing = AVSTREAM_PARSE_FULL;
-    av_set_pts_info(st, 64, 1, 90000);
+    avpriv_set_pts_info(st, 64, 1, 90000);
 
     return 0;
 
@@ -55,33 +56,56 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
 
 static int read_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    int ret, size, pts, type;
-retry:
-    type= avio_rb16(s->pb); // 257 or 258
-    size= avio_rb16(s->pb);
-
-    avio_rb16(s->pb); //some flags, 0x80 indicates end of frame
-    avio_rb16(s->pb); //packet number
-    pts=avio_rb32(s->pb);
-    avio_rb32(s->pb); //6A 13 E3 88
-
-    size -= 12;
-    if(size<1)
-        return -1;
-
-    if(type==258){
-        avio_skip(s->pb, size);
-        goto retry;
+    int ret, size, pts, type, flags;
+    int first_pkt      = 0;
+    int frame_complete = 0;
+
+    while (!frame_complete) {
+
+        type  = avio_rb16(s->pb); // 257 or 258
+        size  = avio_rb16(s->pb);
+        flags = avio_rb16(s->pb); //some flags, 0x80 indicates end of frame
+                avio_rb16(s->pb); //packet number
+        pts   = avio_rb32(s->pb);
+                avio_rb32(s->pb); //6A 13 E3 88
+
+        frame_complete = flags & 0x80;
+
+        size -= 12;
+        if (size < 1)
+            return -1;
+
+        if (type == 258) {
+            avio_skip(s->pb, size);
+            frame_complete = 0;
+            continue;
+        }
+
+        if (!first_pkt) {
+            ret = av_get_packet(s->pb, pkt, size);
+            if (ret < 0)
+                return ret;
+            first_pkt = 1;
+            pkt->pts  = pts;
+            pkt->pos -= 16;
+        } else {
+            ret = av_append_packet(s->pb, pkt, size);
+            if (ret < 0) {
+                av_log(s, AV_LOG_ERROR, "failed to grow packet\n");
+                av_free_packet(pkt);
+                return ret;
+            }
+        }
+        if (ret < size) {
+            av_log(s, AV_LOG_ERROR, "Truncated packet! Read %d of %d bytes\n",
+                   ret, size);
+            pkt->flags |= AV_PKT_FLAG_CORRUPT;
+            break;
+        }
     }
-
-    ret= av_get_packet(s->pb, pkt, size);
-
-    pkt->pts= pts;
-    pkt->pos-=16;
-
     pkt->stream_index = 0;
 
-    return ret;
+    return 0;
 }
 
 AVInputFormat ff_iv8_demuxer = {