virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/flvdec: Remove one level of indentation

Browse Source 
Also remove the condition of AMF_DATA_TYPE_BOOL when parse color
info. There is no AMF_DATA_TYPE_BOOL type in color info.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
This commit is contained in:
Zhao Zhili
2025-03-11 10:35:07 +08:00
parent 4f53ecf114
commit f0cf122cf4
1 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/flvdec.c
View File

@@ -754,11 +754,8 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
} }
} }
if (flv->meta_color_info_flag == FLV_COLOR_INFO_FLAG_PARSING) { if (amf_type == AMF_DATA_TYPE_NUMBER && flv->meta_color_info_flag == FLV_COLOR_INFO_FLAG_PARSING) {
FLVMetaVideoColor *meta_video_color = &flv->meta_color_info; FLVMetaVideoColor *meta_video_color = &flv->meta_color_info;
if (amf_type == AMF_DATA_TYPE_NUMBER ||
amf_type == AMF_DATA_TYPE_BOOL) {
if (!strcmp(key, "colorPrimaries")) { if (!strcmp(key, "colorPrimaries")) {
meta_video_color->primaries = num_val; meta_video_color->primaries = num_val;
} else if (!strcmp(key, "transferCharacteristics")) { } else if (!strcmp(key, "transferCharacteristics")) {
@@ -791,7 +788,6 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
meta_video_color->mastering_meta.min_luminance = num_val; meta_video_color->mastering_meta.min_luminance = num_val;
} }
} }
}
if (amf_type == AMF_DATA_TYPE_OBJECT && s->nb_streams == 1 && if (amf_type == AMF_DATA_TYPE_OBJECT && s->nb_streams == 1 &&
((!apar && !strcmp(key, "audiocodecid")) || ((!apar && !strcmp(key, "audiocodecid")) ||