avcodec/libdav1d: allow setting frame size limit in pixels

Signed-off-by: James Almer <jamrial@gmail.com>
6 years ago · 03ba386833
parent e1039b09c4
commit 03ba386833
2 changed files with 2 additions and 1 deletions
--- a/2
+++ b/2
@ -6202,7 +6202,7 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
                               die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
 enabled libcaca           && require_pkg_config libcaca caca caca.h caca_create_canvas
 enabled libcodec2         && require libcodec2 codec2/codec2.h codec2_create -lcodec2
-enabled libdav1d          && require_pkg_config libdav1d "dav1d >= 0.2.1" "dav1d/dav1d.h" dav1d_version
+enabled libdav1d          && require_pkg_config libdav1d "dav1d >= 0.4.0" "dav1d/dav1d.h" dav1d_version
 enabled libdavs2          && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
 enabled libdc1394         && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
 enabled libdrm            && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@ -130,6 +130,7 @@ static av_cold int libdav1d_init(AVCodecContext *c)
    s.allocator.cookie = dav1d;
    s.allocator.alloc_picture_callback = libdav1d_picture_allocator;
    s.allocator.release_picture_callback = libdav1d_picture_release;
+    s.frame_size_limit = c->max_pixels;
    s.apply_grain = dav1d->apply_grain;

    s.n_tile_threads = dav1d->tile_threads