Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/videolan/dav1d.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Gramner <gramner@twoorioles.com>2019-05-06 00:03:07 +0300
committerHenrik Gramner <henrik@gramner.com>2019-05-06 00:13:01 +0300
commit2dddfaac48cf69e491427dcebab96b8ea9e25500 (patch)
tree13988095cf7b3c8dfbe313ef75b60dec2a8c93e1
parent2756254fc6ba402c5b6ab345944d0878975ed715 (diff)
Add missing dav1d prefixes to picture allocation functions
-rw-r--r--src/lib.c4
-rw-r--r--src/picture.c4
-rw-r--r--src/picture.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib.c b/src/lib.c
index 88aaf83..3a3e859 100644
--- a/src/lib.c
+++ b/src/lib.c
@@ -61,8 +61,8 @@ void dav1d_default_settings(Dav1dSettings *const s) {
s->n_tile_threads = 1;
s->apply_grain = 1;
s->allocator.cookie = NULL;
- s->allocator.alloc_picture_callback = default_picture_allocator;
- s->allocator.release_picture_callback = default_picture_release;
+ s->allocator.alloc_picture_callback = dav1d_default_picture_alloc;
+ s->allocator.release_picture_callback = dav1d_default_picture_release;
s->logger.cookie = NULL;
s->logger.callback = dav1d_log_default_callback;
s->operating_point = 0;
diff --git a/src/picture.c b/src/picture.c
index 86fdd98..50cbaf8 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -45,7 +45,7 @@
#include "src/thread.h"
#include "src/thread_task.h"
-int default_picture_allocator(Dav1dPicture *const p, void *cookie) {
+int dav1d_default_picture_alloc(Dav1dPicture *const p, void *const cookie) {
assert(cookie == NULL);
const int hbd = p->p.bpc > 8;
const int aligned_w = (p->p.w + 127) & ~127;
@@ -76,7 +76,7 @@ int default_picture_allocator(Dav1dPicture *const p, void *cookie) {
return 0;
}
-void default_picture_release(Dav1dPicture *const p, void *cookie) {
+void dav1d_default_picture_release(Dav1dPicture *const p, void *const cookie) {
assert(cookie == NULL);
#ifndef NDEBUG /* safety check */
assert(p->allocator_data == p->data[0]);
diff --git a/src/picture.h b/src/picture.h
index 22b6f2b..9f82de8 100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -105,8 +105,8 @@ int dav1d_thread_picture_wait(const Dav1dThreadPicture *p, int y,
void dav1d_thread_picture_signal(const Dav1dThreadPicture *p, int y,
enum PlaneType plane_type);
-int default_picture_allocator(Dav1dPicture *, void *cookie);
-void default_picture_release(Dav1dPicture *, void *cookie);
+int dav1d_default_picture_alloc(Dav1dPicture *p, void *cookie);
+void dav1d_default_picture_release(Dav1dPicture *p, void *cookie);
void dav1d_picture_unref_internal(Dav1dPicture *p);
#endif /* DAV1D_SRC_PICTURE_H */