ffmpeg | branch: master | vectronic <hello.vectro...@gmail.com> | Mon Sep 23 21:43:05 2019 +0100| [99e34098730c5e222f782a6a3ed3bbc7b276950b] | committer: Derek Buitenhuis
avformat/mov: whitespace indent Signed-off-by: vectronic <hello.vectro...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99e34098730c5e222f782a6a3ed3bbc7b276950b --- libavformat/mov.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 79544da127..f280f360b6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1575,34 +1575,34 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom) return ret; } else { - color_primaries = avio_rb16(pb); - color_trc = avio_rb16(pb); - color_matrix = avio_rb16(pb); - - av_log(c->fc, AV_LOG_TRACE, - "%s: pri %d trc %d matrix %d", - color_parameter_type, color_primaries, color_trc, color_matrix); - - if (!strncmp(color_parameter_type, "nclx", 4)) { - uint8_t color_range = avio_r8(pb) >> 7; - av_log(c->fc, AV_LOG_TRACE, " full %"PRIu8"", color_range); - if (color_range) - st->codecpar->color_range = AVCOL_RANGE_JPEG; - else - st->codecpar->color_range = AVCOL_RANGE_MPEG; - } + color_primaries = avio_rb16(pb); + color_trc = avio_rb16(pb); + color_matrix = avio_rb16(pb); - if (!av_color_primaries_name(color_primaries)) - color_primaries = AVCOL_PRI_UNSPECIFIED; - if (!av_color_transfer_name(color_trc)) - color_trc = AVCOL_TRC_UNSPECIFIED; - if (!av_color_space_name(color_matrix)) - color_matrix = AVCOL_SPC_UNSPECIFIED; + av_log(c->fc, AV_LOG_TRACE, + "%s: pri %d trc %d matrix %d", + color_parameter_type, color_primaries, color_trc, color_matrix); + + if (!strncmp(color_parameter_type, "nclx", 4)) { + uint8_t color_range = avio_r8(pb) >> 7; + av_log(c->fc, AV_LOG_TRACE, " full %"PRIu8"", color_range); + if (color_range) + st->codecpar->color_range = AVCOL_RANGE_JPEG; + else + st->codecpar->color_range = AVCOL_RANGE_MPEG; + } - st->codecpar->color_primaries = color_primaries; - st->codecpar->color_trc = color_trc; - st->codecpar->color_space = color_matrix; - av_log(c->fc, AV_LOG_TRACE, "\n"); + if (!av_color_primaries_name(color_primaries)) + color_primaries = AVCOL_PRI_UNSPECIFIED; + if (!av_color_transfer_name(color_trc)) + color_trc = AVCOL_TRC_UNSPECIFIED; + if (!av_color_space_name(color_matrix)) + color_matrix = AVCOL_SPC_UNSPECIFIED; + + st->codecpar->color_primaries = color_primaries; + st->codecpar->color_trc = color_trc; + st->codecpar->color_space = color_matrix; + av_log(c->fc, AV_LOG_TRACE, "\n"); } return 0; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
