[FFmpeg-devel] [PATCH 1/2] cbs_h264: Fix missing inferred colour description fields

[Andreas Rheinhardt]

Mark Thompson:
> With video_signal_type_present_flag set but colour_description_present_flag
> unset the colour fields would not have had their correct values inferred.
> ---
>  libavcodec/cbs_h264_syntax_template.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c
> index 26be6e590f..1671a15d33 100644
> --- a/libavcodec/cbs_h264_syntax_template.c
> +++ b/libavcodec/cbs_h264_syntax_template.c
> @@ -137,6 +137,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw,
>              ub(8, colour_primaries);
>              ub(8, transfer_characteristics);
>              ub(8, matrix_coefficients);
> +        } else {
> +            infer(colour_primaries,         2);
> +            infer(transfer_characteristics, 2);
> +            infer(matrix_coefficients,      2);
>          }
>      } else {
>          infer(video_format,             5);
> 
LGTM. And sorry for not catching this before 43a18884.

- Andreas