avformat/aviobuf: End grace period of allowing 0 from read_packet

[ffmpeg] / libavformat / tty.c

diff --git a/libavformat/tty.c b/libavformat/tty.c
index 60f7e9f87ee761bd2ee3f8d148595a58ee7248f3..aed5c888c38773144b88e7309a75625e9dc8bd86 100644 (file)
--- a/libavformat/tty.c
+++ b/libavformat/tty.c
@@ -53,10 +53,19 @@ static int read_probe(const AVProbeData *p)
 {
     int cnt = 0;
 
-    for (int i = 0; i < p->buf_size; i++)
+    if (!p->buf_size)
+        return 0;
+
+    for (int i = 0; i < 8 && i < p->buf_size; i++)
+        cnt += !!isansicode(p->buf[i]);
+
+    if (cnt != 8)
+        return 0;
+
+    for (int i = 8; i < p->buf_size; i++)
         cnt += !!isansicode(p->buf[i]);
 
-    return (cnt * 100LL / p->buf_size) * (cnt > 400) *
+    return (cnt * 99LL / p->buf_size) * (cnt > 400) *
         !!av_match_ext(p->filename, tty_extensions);
 }
 
@@ -147,6 +156,8 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
     pkt->size = av_get_packet(avctx->pb, pkt, n);
     if (pkt->size < 0)
         return pkt->size;
+    pkt->stream_index = 0;
+    pkt->pts = pkt->pos / s->chars_per_frame;
     pkt->flags |= AV_PKT_FLAG_KEY;
     return 0;
 }
@@ -176,4 +187,5 @@ AVInputFormat ff_tty_demuxer = {
     .read_packet    = read_packet,
     .extensions     = tty_extensions,
     .priv_class     = &tty_demuxer_class,
+    .flags          = AVFMT_GENERIC_INDEX,
 };