Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
74a50e75
Commit
74a50e75
authored
Nov 04, 2012
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code
parent
008ace35
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
25 deletions
+1
-25
timecode.c
libavutil/timecode.c
+0
-11
timecode.h
libavutil/timecode.h
+1
-11
version.h
libavutil/version.h
+0
-3
No files found.
libavutil/timecode.c
View file @
74a50e75
...
...
@@ -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 */
...
...
libavutil/timecode.h
View file @
74a50e75
...
...
@@ -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_framenum
2
().
* @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.
...
...
libavutil/version.h
View file @
74a50e75
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment