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-09-03 23:36:45 +02:00
parent c8903755ae
commit c2b8a694e1
1 changed files with 77 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/matroskadec.c
View File

@@ -2810,7 +2810,7 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st,
int *extradata_offset) int *extradata_offset)
{ {
FFStream *const sti = ffstream(st); FFStream *const sti = ffstream(st);
MatroskaTrackPlane *planes = track->operation.combine_planes.elem; MatroskaTrackPlane *planes;
int display_width_mul = 1; int display_width_mul = 1;
int display_height_mul = 1; int display_height_mul = 1;
int ret; int ret;
@@ -2823,7 +2823,6 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st,
if (ret < 0) if (ret < 0)
return ret; return ret;
par->codec_type = AVMEDIA_TYPE_VIDEO; par->codec_type = AVMEDIA_TYPE_VIDEO;
par->width = track->video.pixel_width; par->width = track->video.pixel_width;
par->height = track->video.pixel_height; par->height = track->video.pixel_height;
@@ -2834,7 +2833,8 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st,
par->field_order = AV_FIELD_PROGRESSIVE; par->field_order = AV_FIELD_PROGRESSIVE;
if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB) if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB)
mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul); mkv_stereo_mode_display_mul(track->video.stereo_mode,
&display_width_mul, &display_height_mul);
if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) {
if (track->video.display_width && track->video.display_height && if (track->video.display_width && track->video.display_height &&
@@ -2869,6 +2869,7 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st,
av_dict_set_int(&st->metadata, "alpha_mode", 1, 0); av_dict_set_int(&st->metadata, "alpha_mode", 1, 0);
/* if we have virtual track, mark the real tracks */ /* if we have virtual track, mark the real tracks */
planes = track->operation.combine_planes.elem;
for (int j = 0; j < track->operation.combine_planes.nb_elem; j++) { for (int j = 0; j < track->operation.combine_planes.nb_elem; j++) {
MatroskaTrack *tracks = matroska->tracks.elem; MatroskaTrack *tracks = matroska->tracks.elem;
char buf[32]; char buf[32];