RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/h2645_sei: move some common SEI syncing code to ff_h2645_sei_ctx_replace() 

Instead of duplicating it across all supported decoders.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-11-11 19:59:01 -03:00
parent edc7b67508
commit 66014c79ab
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h2645_sei.c
View File

@ -556,6 +556,9 @@ int ff_h2645_sei_ctx_replace(H2645SEI *dst, const H2645SEI *src)
} }
dst->aom_film_grain.enable = src->aom_film_grain.enable; dst->aom_film_grain.enable = src->aom_film_grain.enable;
dst->mastering_display = src->mastering_display;
dst->content_light = src->content_light;
ff_refstruct_replace(&dst->film_grain_characteristics, ff_refstruct_replace(&dst->film_grain_characteristics,
src->film_grain_characteristics); src->film_grain_characteristics);

2
libavcodec/h264_slice.c
View File

@ -442,8 +442,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
return ret; return ret;
h->sei.common.unregistered.x264_build = h1->sei.common.unregistered.x264_build; h->sei.common.unregistered.x264_build = h1->sei.common.unregistered.x264_build;
h->sei.common.mastering_display = h1->sei.common.mastering_display;
h->sei.common.content_light = h1->sei.common.content_light;
if (!h->cur_pic_ptr) if (!h->cur_pic_ptr)
return 0; return 0;

2
libavcodec/hevc/hevcdec.c
View File

@ -4003,8 +4003,6 @@ static int hevc_update_thread_context(AVCodecContext *dst,
s->sei.common.frame_packing = s0->sei.common.frame_packing; s->sei.common.frame_packing = s0->sei.common.frame_packing;
s->sei.common.display_orientation = s0->sei.common.display_orientation; s->sei.common.display_orientation = s0->sei.common.display_orientation;
s->sei.common.alternative_transfer = s0->sei.common.alternative_transfer; s->sei.common.alternative_transfer = s0->sei.common.alternative_transfer;
s->sei.common.mastering_display = s0->sei.common.mastering_display;
s->sei.common.content_light = s0->sei.common.content_light;
s->sei.tdrdi = s0->sei.tdrdi; s->sei.tdrdi = s0->sei.tdrdi;
return 0; return 0;