virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity

avcodec/cbs: Remove CBS_CONTENT_TYPE_POD

Browse Source 
It is equivalent to CBS_CONTENT_TYPE_INTERNAL_REFS
with nb_offsets equal to zero.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-10-19 16:35:47 +02:00
parent ff3c708686
commit 543ef831a8
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/cbs.c
View File

@@ -839,12 +839,10 @@ void ff_cbs_delete_unit(CodedBitstreamFragment *frag,
static void cbs_default_free_unit_content(void *opaque, uint8_t *data)
{
const CodedBitstreamUnitTypeDescriptor *desc = opaque;
if (desc->content_type == CBS_CONTENT_TYPE_INTERNAL_REFS) {
int i;
for (i = 0; i < desc->type.ref.nb_offsets; i++) {
void **ptr = (void**)(data + desc->type.ref.offsets[i]);
av_buffer_unref((AVBufferRef**)(ptr + 1));
}
for (int i = 0; i < desc->type.ref.nb_offsets; i++) {
void **ptr = (void**)(data + desc->type.ref.offsets[i]);
av_buffer_unref((AVBufferRef**)(ptr + 1));
}
av_free(data);
}
@@ -981,14 +979,6 @@ static int cbs_clone_unit_content(CodedBitstreamContext *ctx,
return AVERROR(ENOSYS);
switch (desc->content_type) {
case CBS_CONTENT_TYPE_POD:
ref = av_buffer_alloc(desc->content_size);
if (!ref)
return AVERROR(ENOMEM);
memcpy(ref->data, unit->content, desc->content_size);
err = 0;
break;
case CBS_CONTENT_TYPE_INTERNAL_REFS:
err = cbs_clone_internal_refs_unit_content(&ref, unit, desc);
break;