virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/cbs: Use smaller scope for variables, add const

Browse Source 
And also avoid an unnecessary indirection for src_buf.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-08-04 07:19:29 +02:00
parent e35b8b848c
commit 715d3286bc
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/cbs.c
View File

@ -925,9 +925,8 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref,
const CodedBitstreamUnit *unit,
const CodedBitstreamUnitTypeDescriptor *desc)
{
uint8_t *src, *copy;
uint8_t **src_ptr, **copy_ptr;
AVBufferRef **src_buf, **copy_buf;
const uint8_t *src;
uint8_t *copy;
int err, i;
av_assert0(unit->content);
@ -938,16 +937,16 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref,
return AVERROR(ENOMEM);
for (i = 0; i < desc->nb_ref_offsets; i++) {
src_ptr = (uint8_t**)(src + desc->ref_offsets[i]);
src_buf = (AVBufferRef**)(src_ptr + 1);
copy_ptr = (uint8_t**)(copy + desc->ref_offsets[i]);
copy_buf = (AVBufferRef**)(copy_ptr + 1);
const uint8_t *const *src_ptr = (const uint8_t* const*)(src + desc->ref_offsets[i]);
const AVBufferRef *src_buf = *(AVBufferRef**)(src_ptr + 1);
uint8_t **copy_ptr = (uint8_t**)(copy + desc->ref_offsets[i]);
AVBufferRef **copy_buf = (AVBufferRef**)(copy_ptr + 1);
if (!*src_ptr) {
av_assert0(!*src_buf);
av_assert0(!src_buf);
continue;
}
if (!*src_buf) {
if (!src_buf) {
// We can't handle a non-refcounted pointer here - we don't
// have enough information to handle whatever structure lies
// at the other end of it.
@ -955,7 +954,7 @@ static int cbs_clone_internal_refs_unit_content(AVBufferRef **clone_ref,
goto fail;
}
*copy_buf = av_buffer_ref(*src_buf);
*copy_buf = av_buffer_ref(src_buf);
if (!*copy_buf) {
err = AVERROR(ENOMEM);
goto fail;