highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code

Browse Source
This commit is contained in:
Stefano Sabatini
2012-11-04 12:05:30 +01:00
parent 008ace3524
commit 74a50e75a8
3 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavutil/timecode.c
View File

@ -31,17 +31,6 @@
#include "log.h" #include "log.h"
#include "error.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) int av_timecode_adjust_ntsc_framenum2(int framenum, int fps)
{ {
/* only works for NTSC 29.97 and 59.94 */ /* only works for NTSC 29.97 and 59.94 */

12
libavutil/timecode.h
View File

@ -45,16 +45,6 @@ typedef struct {
unsigned fps; ///< frame per second; must be consistent with the rate field unsigned fps; ///< frame per second; must be consistent with the rate field
} AVTimecode; } 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. * 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 * @return the SMPTE binary representation
* *
* @note Frame number adjustment is automatically done in case of drop timecode, * @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 The frame number is relative to tc->start.
* @note Color frame (CF), binary group flags (BGF) and biphase mark polarity * @note Color frame (CF), binary group flags (BGF) and biphase mark polarity
* correction (PC) bits are set to zero. * correction (PC) bits are set to zero.

3
libavutil/version.h
View File

@ -111,9 +111,6 @@
#ifndef FF_API_OLD_AVOPTIONS #ifndef FF_API_OLD_AVOPTIONS
#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 53) #define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 53)
#endif #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 #ifndef FF_API_PIX_FMT
#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 53) #define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
#endif #endif