summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-12-11 15:24:00 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-12-16 02:37:25 +0100
commitc22a9ece2e7d823507b81e7fe7789545f01e7c88 (patch)
tree840fbfc09fa9eec025531c3d419da6df23a6c144
parentf900a19fa94b1a55b660ec2e5c13419d59754bc0 (diff)
avcodec/h2645_parse: Remove H2645NAL.rbsp_buffer
Forgotten in 03b82b3ab9883cef017e513c7d0b3b986b3b3e7b. (Moving data to the front is only done to make existing initializations like H2645NAL nal = { NULL } not emit int->pointer conversion warnings.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/h2645_parse.c3
-rw-r--r--libavcodec/h2645_parse.h4
2 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c
index 6fbe97ad4a..03780680c6 100644
--- a/libavcodec/h2645_parse.c
+++ b/libavcodec/h2645_parse.c
@@ -92,8 +92,7 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length,
} else if (i > length)
i = length;
- nal->rbsp_buffer = &rbsp->rbsp_buffer[rbsp->rbsp_buffer_size];
- dst = nal->rbsp_buffer;
+ dst = &rbsp->rbsp_buffer[rbsp->rbsp_buffer_size];
memcpy(dst, src, i);
si = di = i;
diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h
index 20a9d355f2..3a13ba248a 100644
--- a/libavcodec/h2645_parse.h
+++ b/libavcodec/h2645_parse.h
@@ -32,10 +32,8 @@
#define MAX_MBPAIR_SIZE (256*1024) // a tighter bound could be calculated if someone cares about a few bytes
typedef struct H2645NAL {
- uint8_t *rbsp_buffer;
-
- int size;
const uint8_t *data;
+ int size;
/**
* Size, in bits, of just the data, excluding the stop bit and any trailing