diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-02 05:05:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-02 05:07:42 +0100 |
| commit | 8fb67c102655dd4de08d99176039d7a404540b06 (patch) | |
| tree | 4d6fa0c64ddea5c161e05696031d1c0e07b0b37d /libavformat/mxfdec.c | |
| parent | 549f052239d9a63d3094df5a6d53448d5282cf24 (diff) | |
| parent | 7d56f2fffc14ad02001ee0689bee76a759da9ede (diff) | |
Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'
* commit '7d56f2fffc14ad02001ee0689bee76a759da9ede':
mxf: Handle negative edit_rate
Conflicts:
libavformat/mxfdec.c
See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfdec.c')
| -rw-r--r-- | libavformat/mxfdec.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 9e2687fe6d..8551adae68 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1462,10 +1462,13 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) if (st->duration == -1) st->duration = AV_NOPTS_VALUE; st->start_time = component->start_position; - if (material_track->edit_rate.num <= 0 || material_track->edit_rate.den <= 0) { + if (material_track->edit_rate.num <= 0 || + material_track->edit_rate.den <= 0) { av_log(mxf->fc, AV_LOG_WARNING, - "invalid edit rate (%d/%d) found on stream #%d, defaulting to 25/1\n", - material_track->edit_rate.num, material_track->edit_rate.den, st->index); + "Invalid edit rate (%d/%d) found on stream #%d, " + "defaulting to 25/1\n", + material_track->edit_rate.num, + material_track->edit_rate.den, st->index); material_track->edit_rate = (AVRational){25, 1}; } avpriv_set_pts_info(st, 64, material_track->edit_rate.den, material_track->edit_rate.num); |