|
|
|
@ -2810,7 +2810,7 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st, |
|
|
|
|
int *extradata_offset) |
|
|
|
|
{ |
|
|
|
|
FFStream *const sti = ffstream(st); |
|
|
|
|
MatroskaTrackPlane *planes = track->operation.combine_planes.elem; |
|
|
|
|
MatroskaTrackPlane *planes; |
|
|
|
|
int display_width_mul = 1; |
|
|
|
|
int display_height_mul = 1; |
|
|
|
|
int ret; |
|
|
|
@ -2823,7 +2823,6 @@ static int mkv_parse_video(MatroskaTrack *track, AVStream *st, |
|
|
|
|
if (ret < 0) |
|
|
|
|
return ret; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
par->codec_type = AVMEDIA_TYPE_VIDEO; |
|
|
|
|
par->width = track->video.pixel_width; |
|
|
|
|
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; |
|
|
|
|
|
|
|
|
|
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_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); |
|
|
|
|
|
|
|
|
|
/* 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++) { |
|
|
|
|
MatroskaTrack *tracks = matroska->tracks.elem; |
|
|
|
|
char buf[32]; |
|
|
|
|