Sophie

Sophie

distrib > Mageia > 7 > i586 > by-pkgid > d0e5450ca1c9f276dfcdb1febdd33a4c > files > 7

ffmpeg-4.1.6-1.mga7.tainted.src.rpm

From: James Almer <jamrial@gmail.com>
Date: Wed, 14 Nov 2018 13:05:25 +0000 (-0300)
Subject: avcodec/libdav1d: fix build after a recent API break
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/752659327d4ac73640781376d214a26765f971f4

avcodec/libdav1d: fix build after a recent API break

Signed-off-by: James Almer <jamrial@gmail.com>
---

diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index 873adfd..b19aee4 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -140,12 +140,18 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
             }
 
             av_fifo_generic_write(dav1d->cache, &pkt, sizeof(pkt), libdav1d_fifo_write);
-        } else {
-            data = NULL;
         }
     }
 
-    res = dav1d_decode(dav1d->c, data, &p);
+    res = dav1d_send_data(dav1d->c, data);
+    if (res < 0) {
+        if (res == -EINVAL)
+            res = AVERROR_INVALIDDATA;
+        if (res != -EAGAIN)
+            return res;
+    }
+
+    res = dav1d_get_picture(dav1d->c, &p);
     if (res < 0) {
         if (res == -EINVAL)
             res = AVERROR_INVALIDDATA;