diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-08-09 17:47:04 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-07 00:28:27 +0200 |
commit | 05ae0ccad93011ca6378342706040947f31ca39f (patch) | |
tree | e3f90b29d4d8ebee4d06e404ba5d1843c7d40091 /libavformat/matroskadec.c | |
parent | 15f96bb07477d087251cf8ae8cb0111be05028d7 (diff) | |
download | ffmpeg-05ae0ccad93011ca6378342706040947f31ca39f.tar.gz |
avformat/matroskadec: Reindent after the previous commit
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r-- | libavformat/matroskadec.c | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3348ce161e..854b225c9e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2739,48 +2739,48 @@ static int mkv_parse_video_codec(MatroskaTrack *track, AVCodecParameters *par, const MatroskaDemuxContext *matroska, int *extradata_offset) { - if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && - track->codec_priv.size >= 40) { - track->ms_compat = 1; - par->bits_per_coded_sample = AV_RL16(track->codec_priv.data + 14); - par->codec_tag = AV_RL32(track->codec_priv.data + 16); - par->codec_id = ff_codec_get_id(ff_codec_bmp_tags, - par->codec_tag); - if (!par->codec_id) - par->codec_id = ff_codec_get_id(ff_codec_movvideo_tags, - par->codec_tag); - *extradata_offset = 40; - return 0; - } else if (!strcmp(track->codec_id, "V_QUICKTIME") && - track->codec_priv.size >= 21) { - enum AVCodecID codec_id; - uint32_t fourcc; - int ret = get_qt_codec(track, &fourcc, &codec_id); - if (ret < 0) - return ret; - if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI ")) { - fourcc = MKTAG('S','V','Q','3'); - codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); - } - par->codec_id = codec_id; - if (codec_id == AV_CODEC_ID_NONE) - av_log(matroska->ctx, AV_LOG_ERROR, - "mov FourCC not found %s.\n", av_fourcc2str(fourcc)); - if (track->codec_priv.size >= 86) { - FFIOContext b; - unsigned bit_depth = AV_RB16(track->codec_priv.data + 82); - ffio_init_context(&b, track->codec_priv.data, - track->codec_priv.size, - 0, NULL, NULL, NULL, NULL); - if (ff_get_qtpalette(codec_id, &b.pub, track->palette)) { - bit_depth &= 0x1F; - track->has_palette = 1; - } - par->bits_per_coded_sample = bit_depth; + if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && + track->codec_priv.size >= 40) { + track->ms_compat = 1; + par->bits_per_coded_sample = AV_RL16(track->codec_priv.data + 14); + par->codec_tag = AV_RL32(track->codec_priv.data + 16); + par->codec_id = ff_codec_get_id(ff_codec_bmp_tags, + par->codec_tag); + if (!par->codec_id) + par->codec_id = ff_codec_get_id(ff_codec_movvideo_tags, + par->codec_tag); + *extradata_offset = 40; + return 0; + } else if (!strcmp(track->codec_id, "V_QUICKTIME") && + track->codec_priv.size >= 21) { + enum AVCodecID codec_id; + uint32_t fourcc; + int ret = get_qt_codec(track, &fourcc, &codec_id); + if (ret < 0) + return ret; + if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI ")) { + fourcc = MKTAG('S','V','Q','3'); + codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); + } + par->codec_id = codec_id; + if (codec_id == AV_CODEC_ID_NONE) + av_log(matroska->ctx, AV_LOG_ERROR, + "mov FourCC not found %s.\n", av_fourcc2str(fourcc)); + if (track->codec_priv.size >= 86) { + FFIOContext b; + unsigned bit_depth = AV_RB16(track->codec_priv.data + 82); + ffio_init_context(&b, track->codec_priv.data, + track->codec_priv.size, + 0, NULL, NULL, NULL, NULL); + if (ff_get_qtpalette(codec_id, &b.pub, track->palette)) { + bit_depth &= 0x1F; + track->has_palette = 1; } - par->codec_tag = fourcc; - return 0; + par->bits_per_coded_sample = bit_depth; } + par->codec_tag = fourcc; + return 0; + } switch (par->codec_id) { case AV_CODEC_ID_RV10: @@ -2794,9 +2794,9 @@ static int mkv_parse_video_codec(MatroskaTrack *track, AVCodecParameters *par, par->codec_tag = AV_RL32(track->codec_priv.data); break; case AV_CODEC_ID_VP9: - /* we don't need any value stored in CodecPrivate. - make sure that it's not exported as extradata. */ - track->codec_priv.size = 0; + /* we don't need any value stored in CodecPrivate. + * make sure that it's not exported as extradata. */ + track->codec_priv.size = 0; break; } |