From: Zhao Zhili <zhiliz...@tencent.com>
Fix error reported by swscaler:
Unsupported input (Operation not supported): fmt:yuv420p csp:unknown
prim:reserved trc:bt709 -> fmt:yuv420p csp:bt709 prim:reserved trc:bt709
---
libavcodec/h2645_vui.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h2645_vui.c b/libavcodec/h2645_vui.c
index e5c7bf46f9..0e576c1563 100644
--- a/libavcodec/h2645_vui.c
+++ b/libavcodec/h2645_vui.c
@@ -67,11 +67,16 @@ void ff_h2645_decode_common_vui_params(GetBitContext *gb,
H2645VUI *vui, void *l
vui->matrix_coeffs = get_bits(gb, 8);
// Set invalid values to "unspecified"
- if (!av_color_primaries_name(vui->colour_primaries))
+ if (vui->colour_primaries == AVCOL_PRI_RESERVED0 ||
+ vui->colour_primaries == AVCOL_PRI_RESERVED ||
+ !av_color_primaries_name(vui->colour_primaries))
vui->colour_primaries = AVCOL_PRI_UNSPECIFIED;
- if (!av_color_transfer_name(vui->transfer_characteristics))
+ if (vui->transfer_characteristics == AVCOL_TRC_RESERVED0 ||
+ vui->transfer_characteristics == AVCOL_TRC_RESERVED ||
+ !av_color_transfer_name(vui->transfer_characteristics))
vui->transfer_characteristics = AVCOL_TRC_UNSPECIFIED;
- if (!av_color_space_name(vui->matrix_coeffs))
+ if (vui->matrix_coeffs == AVCOL_SPC_RESERVED ||
+ !av_color_space_name(vui->matrix_coeffs))
vui->matrix_coeffs = AVCOL_SPC_UNSPECIFIED;
}
}
--
2.46.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
