X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavutil%2Fbuffer_internal.h;h=d902772ed3ebfc024c8ec3c462a4ac1702b8229d;hb=ad524cb9eeb298f7a60d923094fbebb1fda7e0e3;hp=54b67047e5e54d8ea54ca0567c067ea42200832a;hpb=398000abcf980d239a789da6f69811913d2fc635;p=ffmpeg

diff --git a/libavutil/buffer_internal.h b/libavutil/buffer_internal.h
index 54b67047e5e..d902772ed3e 100644
--- a/libavutil/buffer_internal.h
+++ b/libavutil/buffer_internal.h
@@ -22,21 +22,18 @@
 #include <stdatomic.h>
 #include <stdint.h>
 
+#include "internal.h"
 #include "buffer.h"
 #include "thread.h"
 
-/**
- * The buffer is always treated as read-only.
- */
-#define BUFFER_FLAG_READONLY      (1 << 0)
 /**
  * The buffer was av_realloc()ed, so it is reallocatable.
  */
-#define BUFFER_FLAG_REALLOCATABLE (1 << 1)
+#define BUFFER_FLAG_REALLOCATABLE (1 << 0)
 
 struct AVBuffer {
     uint8_t *data; /**< data described by this buffer */
-    int      size; /**< size of data in bytes */
+    buffer_size_t size; /**< size of data in bytes */
 
     /**
      *  number of existing AVBufferRef instances referring to this buffer
@@ -54,9 +51,14 @@ struct AVBuffer {
     void *opaque;
 
     /**
-     * A combination of BUFFER_FLAG_*
+     * A combination of AV_BUFFER_FLAG_*
      */
     int flags;
+
+    /**
+     * A combination of BUFFER_FLAG_*
+     */
+    int flags_internal;
 };
 
 typedef struct BufferPoolEntry {
@@ -88,10 +90,10 @@ struct AVBufferPool {
      */
     atomic_uint refcount;
 
-    int size;
+    buffer_size_t size;
     void *opaque;
-    AVBufferRef* (*alloc)(int size);
-    AVBufferRef* (*alloc2)(void *opaque, int size);
+    AVBufferRef* (*alloc)(buffer_size_t size);
+    AVBufferRef* (*alloc2)(void *opaque, buffer_size_t size);
     void         (*pool_free)(void *opaque);
 };