Commit 5255ca24 authored by Philip de Nier's avatar Philip de Nier Committed by Luca Barbato

mxfdec: set track edit rate num/den in expected order

This matches the order used for the index table edit rate.
Reviewed-by: 's avatarBaptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent 358d854d
...@@ -631,8 +631,8 @@ static int mxf_read_track(void *arg, AVIOContext *pb, int tag, int size, UID uid ...@@ -631,8 +631,8 @@ static int mxf_read_track(void *arg, AVIOContext *pb, int tag, int size, UID uid
avio_read(pb, track->track_number, 4); avio_read(pb, track->track_number, 4);
break; break;
case 0x4B01: case 0x4B01:
track->edit_rate.den = avio_rb32(pb);
track->edit_rate.num = avio_rb32(pb); track->edit_rate.num = avio_rb32(pb);
track->edit_rate.den = avio_rb32(pb);
break; break;
case 0x4803: case 0x4803:
avio_read(pb, track->sequence_ref, 16); avio_read(pb, track->sequence_ref, 16);
...@@ -1369,7 +1369,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) ...@@ -1369,7 +1369,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf)
if (st->duration == -1) if (st->duration == -1)
st->duration = AV_NOPTS_VALUE; st->duration = AV_NOPTS_VALUE;
st->start_time = component->start_position; st->start_time = component->start_position;
avpriv_set_pts_info(st, 64, material_track->edit_rate.num, material_track->edit_rate.den); avpriv_set_pts_info(st, 64, material_track->edit_rate.den, material_track->edit_rate.num);
PRINT_KEY(mxf->fc, "data definition ul", source_track->sequence->data_definition_ul); PRINT_KEY(mxf->fc, "data definition ul", source_track->sequence->data_definition_ul);
codec_ul = mxf_get_codec_ul(ff_mxf_data_definition_uls, &source_track->sequence->data_definition_ul); codec_ul = mxf_get_codec_ul(ff_mxf_data_definition_uls, &source_track->sequence->data_definition_ul);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment