summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2020-04-20 15:33:18 -0300
committerJames Almer <jamrial@gmail.com>2020-05-03 19:53:00 -0300
commitbdfc1d3cd33079b44dcb1f2ba02bfc69b811a3ca (patch)
tree85680d4f72c09ab6a88912512d2bfea3e953b799 /libavcodec
parentaa6d32ae43dbd7ec43e4c86ca05ad2137ec6a4bc (diff)
avcodec/cbs_h265: rename H265RawPSExtensionData to H265RawExtensionData
So that NAL types other than Parameter Set ones may use it. Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/cbs_h265.h10
-rw-r--r--libavcodec/cbs_h265_syntax_template.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h
index ad746bf35f..2c1e153ad9 100644
--- a/libavcodec/cbs_h265.h
+++ b/libavcodec/cbs_h265.h
@@ -182,11 +182,11 @@ typedef struct H265RawVUI {
uint8_t log2_max_mv_length_vertical;
} H265RawVUI;
-typedef struct H265RawPSExtensionData {
+typedef struct H265RawExtensionData {
uint8_t *data;
size_t bit_length;
AVBufferRef *data_ref;
-} H265RawPSExtensionData;
+} H265RawExtensionData;
typedef struct H265RawVPS {
H265RawNALUnitHeader nal_unit_header;
@@ -221,7 +221,7 @@ typedef struct H265RawVPS {
H265RawHRDParameters hrd_parameters[HEVC_MAX_LAYER_SETS];
uint8_t vps_extension_flag;
- H265RawPSExtensionData extension_data;
+ H265RawExtensionData extension_data;
} H265RawVPS;
typedef struct H265RawSTRefPicSet {
@@ -325,7 +325,7 @@ typedef struct H265RawSPS {
uint8_t sps_scc_extension_flag;
uint8_t sps_extension_4bits;
- H265RawPSExtensionData extension_data;
+ H265RawExtensionData extension_data;
// Range extension.
uint8_t transform_skip_rotation_enabled_flag;
@@ -413,7 +413,7 @@ typedef struct H265RawPPS {
uint8_t pps_scc_extension_flag;
uint8_t pps_extension_4bits;
- H265RawPSExtensionData extension_data;
+ H265RawExtensionData extension_data;
// Range extension.
uint8_t log2_max_transform_skip_block_size_minus2;
diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c
index 0696eeeb9e..a51b12cfc6 100644
--- a/libavcodec/cbs_h265_syntax_template.c
+++ b/libavcodec/cbs_h265_syntax_template.c
@@ -59,7 +59,7 @@ static int FUNC(byte_alignment)(CodedBitstreamContext *ctx, RWContext *rw)
}
static int FUNC(extension_data)(CodedBitstreamContext *ctx, RWContext *rw,
- H265RawPSExtensionData *current)
+ H265RawExtensionData *current)
{
int err;
size_t k;