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/matroskadec: Reindent after the previous commit

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2023-08-09 17:47:04 +02:00
parent 15f96bb074
commit 05ae0ccad9
1 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
libavformat/matroskadec.c
View File

@@ -2739,48 +2739,48 @@ static int mkv_parse_video_codec(MatroskaTrack *track, AVCodecParameters *par,
const MatroskaDemuxContext *matroska, const MatroskaDemuxContext *matroska,
int *extradata_offset) int *extradata_offset)
{ {
if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") &&
track->codec_priv.size >= 40) { track->codec_priv.size >= 40) {
track->ms_compat = 1; track->ms_compat = 1;
par->bits_per_coded_sample = AV_RL16(track->codec_priv.data + 14); par->bits_per_coded_sample = AV_RL16(track->codec_priv.data + 14);
par->codec_tag = AV_RL32(track->codec_priv.data + 16); par->codec_tag = AV_RL32(track->codec_priv.data + 16);
par->codec_id = ff_codec_get_id(ff_codec_bmp_tags, par->codec_id = ff_codec_get_id(ff_codec_bmp_tags,
par->codec_tag); par->codec_tag);
if (!par->codec_id) if (!par->codec_id)
par->codec_id = ff_codec_get_id(ff_codec_movvideo_tags, par->codec_id = ff_codec_get_id(ff_codec_movvideo_tags,
par->codec_tag); par->codec_tag);
*extradata_offset = 40; *extradata_offset = 40;
return 0; return 0;
} else if (!strcmp(track->codec_id, "V_QUICKTIME") && } else if (!strcmp(track->codec_id, "V_QUICKTIME") &&
track->codec_priv.size >= 21) { track->codec_priv.size >= 21) {
enum AVCodecID codec_id; enum AVCodecID codec_id;
uint32_t fourcc; uint32_t fourcc;
int ret = get_qt_codec(track, &fourcc, &codec_id); int ret = get_qt_codec(track, &fourcc, &codec_id);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI ")) { if (codec_id == AV_CODEC_ID_NONE && AV_RL32(track->codec_priv.data+4) == AV_RL32("SMI ")) {
fourcc = MKTAG('S','V','Q','3'); fourcc = MKTAG('S','V','Q','3');
codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); 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;
}
par->codec_tag = fourcc;
return 0;
} }
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;
}
par->codec_tag = fourcc;
return 0;
}
switch (par->codec_id) { switch (par->codec_id) {
case AV_CODEC_ID_RV10: 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); par->codec_tag = AV_RL32(track->codec_priv.data);
break; break;
case AV_CODEC_ID_VP9: case AV_CODEC_ID_VP9:
/* we don't need any value stored in CodecPrivate. /* we don't need any value stored in CodecPrivate.
make sure that it's not exported as extradata. */ * make sure that it's not exported as extradata. */
track->codec_priv.size = 0; track->codec_priv.size = 0;
break; break;
} }