From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 10/20] avformat/matroskadec: Reindent after the previous commit
Date: Mon, 4 Sep 2023 13:27:49 +0200
Message-ID: <AS8P250MB0744E9332336C7E3264814398FE9A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB0744314AD7A516CFC71F61BF8FE9A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavformat/matroskadec.c | 86 +++++++++++++++++++--------------------
1 file 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;
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-09-04 11:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-04 11:26 [FFmpeg-devel] [PATCH 01/20] fate/matroska: Add test for remuxing non-rotation displaymatrix Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 02/20] avformat/matroskadec: Set several stream parameters earlier Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 03/20] avformat/matroskadec: Use dedicated pointer for access to codecpar Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 04/20] avformat/matroskadec: Redo handling extradata allocation Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 05/20] avformat/matroskadec: Set AVCodecParameters earlier Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 06/20] avformat/matroskdec: Factor audio parsing out of matroska_parse_tracks() Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 07/20] avformat/matroskadec: Remove redundant checks Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 08/20] avformat/matroskadec: Reindent after the previous commit Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 09/20] avformat/matroskadec: Factor video parsing out of matroska_parse_tracks() Andreas Rheinhardt
2023-09-04 11:27 ` Andreas Rheinhardt [this message]
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 11/20] avformat/matroskadec: Move reading color space to a better place Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 12/20] avformat/matroskadec: Avoid clobbering CodecPrivate size Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 13/20] avformat/matroskadec: Use av_dict_set_int() where appropriate Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 14/20] avformat/matroskadec: Factor parsing subtitle codecs out Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 15/20] avformat/matroskadec: Factor generic parsing of video tracks out Andreas Rheinhardt
2023-09-04 11:46 ` James Almer
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 16/20] avformat/matroskadec: Reindent after the previous commit Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 17/20] avformat/matroskadec: Factor generic parsing of audio tracks out Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 18/20] avformat/matroskdec: Reindent after the previous commit Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 19/20] avformat/matroskadec: Move WEBVTT code to mkv_parse_subtitle_codec() Andreas Rheinhardt
2023-09-04 11:27 ` [FFmpeg-devel] [PATCH 20/20] avformat/matroskadec: Factor parsing content encodings out Andreas Rheinhardt
2023-09-06 9:37 ` [FFmpeg-devel] [PATCH 01/20] fate/matroska: Add test for remuxing non-rotation displaymatrix Andreas Rheinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8P250MB0744E9332336C7E3264814398FE9A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git