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
30315a8d
Commit
30315a8d
authored
May 09, 2011
by
Alex Converse
Committed by
Alex Converse
May 25, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: Add fpsprobesize as an AVOption.
parent
80068da3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
2 deletions
+13
-2
APIchanges
doc/APIchanges
+3
-0
avformat.h
libavformat/avformat.h
+5
-0
options.c
libavformat/options.c
+1
-0
utils.c
libavformat/utils.c
+2
-0
version.h
libavformat/version.h
+2
-2
No files found.
doc/APIchanges
View file @
30315a8d
...
...
@@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first:
2011-05-25 - XXXXXXX - lavf 53.1.0 - avformat.h
Add fps_probe_size to AVFormatContext.
2011-05-18 - 64150ff - lavc 53.4.0 - AVCodecContext.request_sample_fmt
Add request_sample_fmt field to AVCodecContext.
...
...
libavformat/avformat.h
View file @
30315a8d
...
...
@@ -817,6 +817,11 @@ typedef struct AVFormatContext {
* - decoding: Unused.
*/
int64_t
start_time_realtime
;
/**
* decoding: number of frames used to probe fps
*/
int
fps_probe_size
;
}
AVFormatContext
;
typedef
struct
AVPacketList
{
...
...
libavformat/options.c
View file @
30315a8d
...
...
@@ -57,6 +57,7 @@ static const AVOption options[]={
{
"fdebug"
,
"print specific debug info"
,
OFFSET
(
debug
),
FF_OPT_TYPE_FLAGS
,
{.
dbl
=
DEFAULT
},
0
,
INT_MAX
,
E
|
D
,
"fdebug"
},
{
"ts"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_FDEBUG_TS
},
INT_MIN
,
INT_MAX
,
E
|
D
,
"fdebug"
},
{
"max_delay"
,
"maximum muxing or demuxing delay in microseconds"
,
OFFSET
(
max_delay
),
FF_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
0
,
INT_MAX
,
E
|
D
},
{
"fpsprobesize"
,
"number of frames used to probe fps"
,
OFFSET
(
fps_probe_size
),
FF_OPT_TYPE_INT
,
-
1
,
-
1
,
INT_MAX
-
1
,
D
},
{
NULL
},
};
...
...
libavformat/utils.c
View file @
30315a8d
...
...
@@ -2229,6 +2229,8 @@ int av_find_stream_info(AVFormatContext *ic)
the correct fps */
if
(
av_q2d
(
st
->
time_base
)
>
0
.
0005
)
fps_analyze_framecount
*=
2
;
if
(
ic
->
fps_probe_size
>=
0
)
fps_analyze_framecount
=
ic
->
fps_probe_size
;
/* variable fps and no guess at the real fps */
if
(
tb_unreliable
(
st
->
codec
)
&&
!
(
st
->
r_frame_rate
.
num
&&
st
->
avg_frame_rate
.
num
)
&&
st
->
info
->
duration_count
<
fps_analyze_framecount
...
...
libavformat/version.h
View file @
30315a8d
...
...
@@ -24,8 +24,8 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 53
#define LIBAVFORMAT_VERSION_MINOR
0
#define LIBAVFORMAT_VERSION_MICRO
3
#define LIBAVFORMAT_VERSION_MINOR
1
#define LIBAVFORMAT_VERSION_MICRO
0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
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