Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f0cb1395
Commit
f0cb1395
authored
Jan 12, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: remove disabled FF_API_MUXRATE cruft
parent
2f5e728b
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
22 deletions
+0
-22
avformat.h
libavformat/avformat.h
+0
-6
mpegenc.c
libavformat/mpegenc.c
+0
-5
mpegtsenc.c
libavformat/mpegtsenc.c
+0
-5
options.c
libavformat/options.c
+0
-3
version.h
libavformat/version.h
+0
-3
No files found.
libavformat/avformat.h
View file @
f0cb1395
...
...
@@ -850,12 +850,6 @@ typedef struct AVFormatContext {
int64_t
data_offset
;
/**< offset of the first packet */
#endif
#if FF_API_MUXRATE
/**
* use mpeg muxer private options instead
*/
attribute_deprecated
int
mux_rate
;
#endif
unsigned
int
packet_size
;
#if FF_API_PRELOAD
attribute_deprecated
int
preload
;
...
...
libavformat/mpegenc.c
View file @
f0cb1395
...
...
@@ -421,11 +421,6 @@ static int mpeg_mux_init(AVFormatContext *ctx)
video_bitrate
+=
codec_rate
;
}
#if FF_API_MUXRATE
if
(
ctx
->
mux_rate
){
s
->
mux_rate
=
(
ctx
->
mux_rate
+
(
8
*
50
)
-
1
)
/
(
8
*
50
);
}
else
#endif
if
(
!
s
->
mux_rate
)
{
/* we increase slightly the bitrate to take into account the
headers. XXX: compute it exactly */
...
...
libavformat/mpegtsenc.c
View file @
f0cb1395
...
...
@@ -549,11 +549,6 @@ static int mpegts_write_header(AVFormatContext *s)
service
->
pcr_pid
=
ts_st
->
pid
;
}
#if FF_API_MUXRATE
if
(
s
->
mux_rate
)
ts
->
mux_rate
=
s
->
mux_rate
;
#endif
if
(
ts
->
mux_rate
>
1
)
{
service
->
pcr_packet_period
=
(
ts
->
mux_rate
*
PCR_RETRANS_TIME
)
/
(
TS_PACKET_SIZE
*
8
*
1000
);
...
...
libavformat/options.c
View file @
f0cb1395
...
...
@@ -82,9 +82,6 @@ static const AVClass *format_child_class_next(const AVClass *prev)
static
const
AVOption
options
[]
=
{
{
"probesize"
,
"set probing size"
,
OFFSET
(
probesize
),
AV_OPT_TYPE_INT
,
{.
dbl
=
5000000
},
32
,
INT_MAX
,
D
},
#if FF_API_MUXRATE
{
"muxrate"
,
"set mux rate"
,
OFFSET
(
mux_rate
),
AV_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
0
,
INT_MAX
,
E
},
#endif
{
"packetsize"
,
"set packet size"
,
OFFSET
(
packet_size
),
AV_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
0
,
INT_MAX
,
E
},
{
"fflags"
,
NULL
,
OFFSET
(
flags
),
AV_OPT_TYPE_FLAGS
,
{.
dbl
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
D
|
E
,
"fflags"
},
{
"ignidx"
,
"ignore index"
,
0
,
AV_OPT_TYPE_CONST
,
{.
dbl
=
AVFMT_FLAG_IGNIDX
},
INT_MIN
,
INT_MAX
,
D
,
"fflags"
},
...
...
libavformat/version.h
View file @
f0cb1395
...
...
@@ -47,9 +47,6 @@
* Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time.
*/
#ifndef FF_API_MUXRATE
#define FF_API_MUXRATE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_RTSP_URL_OPTIONS
#define FF_API_RTSP_URL_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 54)
#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