summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Demers2018-02-25 03:52:49 -0500
committerAlexandre Demers2018-02-25 03:52:49 -0500
commit24db8642f1ba5f2002f9a460287084091bae1bff (patch)
tree474d9951b09487032ed08a970a03b7c77cddc576
parent27369ea7fdaf64857fa817361fea3a18a243e3f7 (diff)
downloadaur-24db8642f1ba5f2002f9a460287084091bae1bff.tar.gz
update fs56089
-rw-r--r--fs56089.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs56089.patch b/fs56089.patch
index a0773726027..6aca38f9f96 100644
--- a/fs56089.patch
+++ b/fs56089.patch
@@ -4,7 +4,7 @@ diff -rupN ffmpeg-3.4.orig/libavformat/aviobuf.c ffmpeg-3.4/libavformat/aviobuf.
@@ -531,6 +531,24 @@ void avio_write_marker(AVIOContext *s, i
s->last_time = time;
}
-
+
+static int read_packet_wrapper(AVIOContext *s, uint8_t *buf, int size)
+{
+ int ret;
@@ -24,12 +24,12 @@ diff -rupN ffmpeg-3.4.orig/libavformat/aviobuf.c ffmpeg-3.4/libavformat/aviobuf.
+}
+
/* 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
@@ -45,12 +45,12 @@ diff -rupN ffmpeg-3.4.orig/libavformat/aviobuf.c ffmpeg-3.4/libavformat/aviobuf.
- 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, un
return -1;
-
+
if (s->read_packet && s->write_flag) {
- len = s->read_packet(s->opaque, buf, size);
+ len = read_packet_wrapper(s, buf, size);
@@ -79,6 +79,6 @@ diff -rupN ffmpeg-3.4.orig/libavformat/version.h ffmpeg-3.4/libavformat/version.
+#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