diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2012-05-27 14:21:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-27 13:41:58 +0200 |
| commit | 789f8cb03a08ea4346a0405b78287ed88df89bf1 (patch) | |
| tree | 5ce8d50fcf4eb4b108a3efa27506f084763759e9 /libavcodec | |
| parent | 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5 (diff) | |
| download | ffmpeg-789f8cb03a08ea4346a0405b78287ed88df89bf1.tar.gz | |
avutil: support 50 and 60 frame rates in timecode api
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 6ca2c8430d..9536d64a41 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -300,7 +300,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) s->gop_picture_number = s->current_picture_ptr->f.coded_picture_number; av_assert0(s->drop_frame_timecode == !!(s->tc.flags & AV_TIMECODE_FLAG_DROPFRAME)); if (s->drop_frame_timecode) - time_code = av_timecode_adjust_ntsc_framenum(time_code); + time_code = av_timecode_adjust_ntsc_framenum2(time_code, fps); put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24)); put_bits(&s->pb, 6, (uint32_t)((time_code / (fps * 60)) % 60)); put_bits(&s->pb, 1, 1); |