virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

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

Browse Source 
See a606f27f4c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2021-03-06 16:51:13 +01:00
committed by James Almer
parent 7b6012efaa
commit 252500a78f
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/aviobuf.c
View File

@@ -519,14 +519,7 @@ static int read_packet_wrapper(AVIOContext *s, uint8_t *buf, int size)
if (!s->read_packet) if (!s->read_packet)
return AVERROR(EINVAL); return AVERROR(EINVAL);
ret = s->read_packet(s->opaque, buf, size); 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); av_assert2(ret || s->max_packet_size);
#endif
return ret; return ret;
} }

3
libavformat/version.h
View File

@@ -58,9 +58,6 @@
#ifndef FF_API_LAVF_AVCTX #ifndef FF_API_LAVF_AVCTX
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59) #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif #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 #ifndef FF_API_OLD_RTSP_OPTIONS
#define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59) #define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif #endif