diff --git a/libavutil/timecode.c b/libavutil/timecode.c index fcbd00d660..77d828d56f 100644 --- a/libavutil/timecode.c +++ b/libavutil/timecode.c @@ -31,17 +31,6 @@ #include "log.h" #include "error.h" -#ifdef FF_API_OLD_TC_ADJUST_FRAMENUM -int av_timecode_adjust_ntsc_framenum(int framenum) -{ - /* only works for NTSC 29.97 */ - int d = framenum / 17982; - int m = framenum % 17982; - //if (m < 2) m += 2; /* not needed since -2,-1 / 1798 in C returns 0 */ - return framenum + 18 * d + 2 * ((m - 2) / 1798); -} -#endif - int av_timecode_adjust_ntsc_framenum2(int framenum, int fps) { /* only works for NTSC 29.97 and 59.94 */ diff --git a/libavutil/timecode.h b/libavutil/timecode.h index 17d6b95ffd..56e3975fd8 100644 --- a/libavutil/timecode.h +++ b/libavutil/timecode.h @@ -45,16 +45,6 @@ typedef struct { unsigned fps; ///< frame per second; must be consistent with the rate field } AVTimecode; -/** - * Adjust frame number for NTSC drop frame time code. - * - * @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 - */ -attribute_deprecated int av_timecode_adjust_ntsc_framenum(int framenum); - /** * Adjust frame number for NTSC drop frame time code. * @@ -73,7 +63,7 @@ int av_timecode_adjust_ntsc_framenum2(int framenum, int fps); * @return the SMPTE binary representation * * @note Frame number adjustment is automatically done in case of drop timecode, - * you do NOT have to call av_timecode_adjust_ntsc_framenum(). + * you do NOT have to call av_timecode_adjust_ntsc_framenum2(). * @note The frame number is relative to tc->start. * @note Color frame (CF), binary group flags (BGF) and biphase mark polarity * correction (PC) bits are set to zero. diff --git a/libavutil/version.h b/libavutil/version.h index 809530e0d8..a5d3e179de 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -111,9 +111,6 @@ #ifndef FF_API_OLD_AVOPTIONS #define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 53) #endif -#ifndef FF_API_OLD_TC_ADJUST_FRAMENUM -#define FF_API_OLD_TC_ADJUST_FRAMENUM (LIBAVUTIL_VERSION_MAJOR < 52) -#endif #ifndef FF_API_PIX_FMT #define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 53) #endif