summaryrefslogtreecommitdiff
path: root/libavformat/mxfdec.c
diff options
context:
space:
mode:
authorPhilip de Nier <philipn@rd.bbc.co.uk>2012-02-28 14:16:36 +0000
committerLuca Barbato <lu_zero@gentoo.org>2012-07-10 13:51:03 +0200
commit5255ca24cd1136175868fec3b419e3af024042a1 (patch)
tree37e42c3451b756b2673489839384ff3d353a2e71 /libavformat/mxfdec.c
parent358d854df80e035c9d47bae21492b51b406dbe68 (diff)
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 <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat/mxfdec.c')
-rw-r--r--libavformat/mxfdec.c4
1 files 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);