From 5255ca24cd1136175868fec3b419e3af024042a1 Mon Sep 17 00:00:00 2001 From: Philip de Nier Date: Tue, 28 Feb 2012 14:16:36 +0000 Subject: [PATCH] mxfdec: set track edit rate num/den in expected order This matches the order used for the index table edit rate. Reviewed-by: Baptiste Coudurier Signed-off-by: Michael Niedermayer Signed-off-by: Luca Barbato --- libavformat/mxfdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 594ba49f34..70f99412e4 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -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); break; case 0x4B01: - track->edit_rate.den = avio_rb32(pb); track->edit_rate.num = avio_rb32(pb); + track->edit_rate.den = avio_rb32(pb); break; case 0x4803: avio_read(pb, track->sequence_ref, 16); @@ -1369,7 +1369,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) if (st->duration == -1) st->duration = AV_NOPTS_VALUE; 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); codec_ul = mxf_get_codec_ul(ff_mxf_data_definition_uls, &source_track->sequence->data_definition_ul);