From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Date: Sat, 6 Mar 2021 15:51:13 +0000 (+0100)
Subject: avformat/aviobuf: End grace period of allowing 0 from read_packet
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=252500a78fe1a31abc79e6070d16f50382c39343;p=ffmpeg

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

See a606f27f4c610708fa96e35eed7b7537d3d8f712.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 518cb111293..1ecc7fb095f 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -519,14 +519,7 @@ static int read_packet_wrapper(AVIOContext *s, uint8_t *buf, int size)
     if (!s->read_packet)
         return AVERROR(EINVAL);
     ret = s->read_packet(s->opaque, buf, size);
-#if FF_API_OLD_AVIO_EOF_0
-    if (!ret && !s->max_packet_size) {
-        av_log(NULL, AV_LOG_WARNING, "Invalid return value 0 for stream protocol\n");
-        ret = AVERROR_EOF;
-    }
-#else
     av_assert2(ret || s->max_packet_size);
-#endif
     return ret;
 }
 
diff --git a/libavformat/version.h b/libavformat/version.h
index 310b060d441..fbf32f8e1b6 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -58,9 +58,6 @@
 #ifndef FF_API_LAVF_AVCTX
 #define FF_API_LAVF_AVCTX               (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif
-#ifndef FF_API_OLD_AVIO_EOF_0
-#define FF_API_OLD_AVIO_EOF_0           (LIBAVFORMAT_VERSION_MAJOR < 59)
-#endif
 #ifndef FF_API_OLD_RTSP_OPTIONS
 #define FF_API_OLD_RTSP_OPTIONS         (LIBAVFORMAT_VERSION_MAJOR < 59)
 #endif