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 /libavutil/timecode.h | |
| 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 'libavutil/timecode.h')
| -rw-r--r-- | libavutil/timecode.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libavutil/timecode.h b/libavutil/timecode.h index da252c1c17..be4102e577 100644 --- a/libavutil/timecode.h +++ b/libavutil/timecode.h @@ -51,8 +51,19 @@ typedef struct { * @param framenum frame number to adjust * @return adjusted frame number * @warning adjustment is only valid in NTSC 29.97 + * @deprecated use av_timecode_adjust_ntsc_framenum2 instead */ -int av_timecode_adjust_ntsc_framenum(int framenum); +attribute_deprecated int av_timecode_adjust_ntsc_framenum(int framenum); + +/** + * Adjust frame number for NTSC drop frame time code. + * + * @param framenum frame number to adjust + * @param fps frame per second, 30 or 60 + * @return adjusted frame number + * @warning adjustment is only valid in NTSC 29.97 and 59.94 + */ +int av_timecode_adjust_ntsc_framenum2(int framenum, int fps); /** * Convert frame number to SMPTE 12M binary representation. |