diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-10-31 00:19:38 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-11-16 23:47:41 +0100 |
| commit | ce001bb8fc6677541c401a614e05e5058d58dde1 (patch) | |
| tree | 71e45d8ac2eb1b13dc02fa22f24947eea06828b9 /libavformat | |
| parent | 55937bb4a7df157fb08f79e7e623a16280533275 (diff) | |
| download | ffmpeg-ce001bb8fc6677541c401a614e05e5058d58dde1.tar.gz | |
lavf/mxf: Support 60fps output.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mxf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index bfc3218b81..5994b09914 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -137,6 +137,7 @@ static const MXFSamplesPerFrame mxf_spf[] = { { { 1001, 60000 }, { 801, 801, 801, 801, 800, 0 } }, // NTSC 59.94 { { 1, 25 }, { 1920, 0, 0, 0, 0, 0 } }, // PAL 25 { { 1, 50 }, { 960, 0, 0, 0, 0, 0 } }, // PAL 50 + { { 1, 60 }, { 800, 0, 0, 0, 0, 0 } }, }; static const AVRational mxf_time_base[] = { @@ -146,6 +147,7 @@ static const AVRational mxf_time_base[] = { { 1001, 60000 }, { 1, 25 }, { 1, 50 }, + { 1, 60 }, { 0, 0} }; |