diff --git a/media-video/ffmpeg/patches/ffmpeg-3.4.patchset b/media-video/ffmpeg/patches/ffmpeg-3.4.patchset deleted file mode 100644 index 3bd506283..000000000 --- a/media-video/ffmpeg/patches/ffmpeg-3.4.patchset +++ /dev/null @@ -1,123 +0,0 @@ -From a3a73c183d740c6b9e3f52dc26e401ca2a0ad11b Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 16 Oct 2017 18:31:07 +0200 -Subject: disable ebx on x86. - - -diff --git a/configure b/configure -index 18d80ee..1547cf8 100755 ---- a/configure -+++ b/configure -@@ -6594,6 +6594,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt - if test $target_os = "haiku"; then - disable memalign - disable posix_memalign -+ enabled x86_32 && enabled shared && disable ebx_available - fi - - # add_dep lib dep --- -2.14.2 - - -From 54d69f3a0979721f61b46c3beb13c50b8836ae62 Mon Sep 17 00:00:00 2001 -From: Nicolas George -Date: Fri, 27 Oct 2017 20:46:28 +0200 -Subject: lavf/avio: temporarily accept 0 as EOF. - -Print a warning to let applicatios fix their use. -After a deprecation period, check with a low-level assert. -Also make the constraint explicit in the doxygen comment. - -Signed-off-by: Nicolas George - -diff --git a/libavformat/avio.h b/libavformat/avio.h -index f9c5972..250cf90 100644 ---- a/libavformat/avio.h -+++ b/libavformat/avio.h -@@ -452,6 +452,8 @@ void avio_free_directory_entry(AVIODirEntry **entry); - * @param write_flag Set to 1 if the buffer should be writable, 0 otherwise. - * @param opaque An opaque pointer to user-specific data. - * @param read_packet A function for refilling the buffer, may be NULL. -+ * For stream protocols, must never return 0 but rather -+ * a proper AVERROR code. - * @param write_packet A function for writing the buffer contents, may be NULL. - * The function may not change the input buffers content. - * @param seek A function for seeking to specified byte position, may be NULL. -diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c -index 636cb46..a862d27 100644 ---- a/libavformat/aviobuf.c -+++ b/libavformat/aviobuf.c -@@ -531,6 +531,24 @@ void avio_write_marker(AVIOContext *s, int64_t time, enum AVIODataMarkerType typ - s->last_time = time; - } - -+static int read_packet_wrapper(AVIOContext *s, uint8_t *buf, int size) -+{ -+ int ret; -+ -+ if (!s->read_packet) -+ return AVERROR_EOF; -+ 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; -+} -+ - /* Input stream */ - - static void fill_buffer(AVIOContext *s) -@@ -569,10 +587,7 @@ static void fill_buffer(AVIOContext *s) - len = s->orig_buffer_size; - } - -- if (s->read_packet) -- len = s->read_packet(s->opaque, dst, len); -- else -- len = 0; -+ len = read_packet_wrapper(s, dst, len); - if (len <= 0) { - /* do not modify buffer if EOF reached so that a seek back can - be done without rereading data */ -@@ -644,8 +659,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size) - if (len == 0 || s->write_flag) { - if((s->direct || size > s->buffer_size) && !s->update_checksum) { - // bypass the buffer and read data directly into buf -- if(s->read_packet) -- len = s->read_packet(s->opaque, buf, size); -+ len = read_packet_wrapper(s, buf, size); - - if (len <= 0) { - /* do not modify buffer if EOF reached so that a seek back can -@@ -711,7 +725,7 @@ int avio_read_partial(AVIOContext *s, unsigned char *buf, int size) - return -1; - - if (s->read_packet && s->write_flag) { -- len = s->read_packet(s->opaque, buf, size); -+ len = read_packet_wrapper(s, buf, size); - if (len > 0) - s->pos += len; - return len; -diff --git a/libavformat/version.h b/libavformat/version.h -index 878917d..ba400e1 100644 ---- a/libavformat/version.h -+++ b/libavformat/version.h -@@ -97,6 +97,9 @@ - #ifndef FF_API_OLD_ROTATE_API - #define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 58) - #endif -+#ifndef FF_API_OLD_AVIO_EOF_0 -+#define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 58) -+#endif - - - #ifndef FF_API_R_FRAME_RATE --- -2.14.2 -