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
2a0f868c
Commit
2a0f868c
authored
Jan 12, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: remove disabled FF_API_PRELOAD cruft
parent
1329827e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
10 deletions
+0
-10
avformat.h
libavformat/avformat.h
+0
-3
mpegenc.c
libavformat/mpegenc.c
+0
-4
version.h
libavformat/version.h
+0
-3
No files found.
libavformat/avformat.h
View file @
2a0f868c
...
@@ -851,9 +851,6 @@ typedef struct AVFormatContext {
...
@@ -851,9 +851,6 @@ typedef struct AVFormatContext {
#endif
#endif
unsigned
int
packet_size
;
unsigned
int
packet_size
;
#if FF_API_PRELOAD
attribute_deprecated
int
preload
;
#endif
int
max_delay
;
int
max_delay
;
int
flags
;
int
flags
;
...
...
libavformat/mpegenc.c
View file @
2a0f868c
...
@@ -1158,10 +1158,6 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt)
...
@@ -1158,10 +1158,6 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt)
int
preload
;
int
preload
;
const
int
is_iframe
=
st
->
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
&&
(
pkt
->
flags
&
AV_PKT_FLAG_KEY
);
const
int
is_iframe
=
st
->
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
&&
(
pkt
->
flags
&
AV_PKT_FLAG_KEY
);
#if FF_API_PRELOAD
if
(
ctx
->
preload
)
s
->
preload
=
ctx
->
preload
;
#endif
preload
=
av_rescale
(
s
->
preload
,
90000
,
AV_TIME_BASE
);
preload
=
av_rescale
(
s
->
preload
,
90000
,
AV_TIME_BASE
);
pts
=
pkt
->
pts
;
pts
=
pkt
->
pts
;
...
...
libavformat/version.h
View file @
2a0f868c
...
@@ -47,9 +47,6 @@
...
@@ -47,9 +47,6 @@
* Those FF_API_* defines are not part of public API.
* Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time.
* They may change, break or disappear at any time.
*/
*/
#ifndef FF_API_PRELOAD
#define FF_API_PRELOAD (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_STREAM_COPY
#ifndef FF_API_STREAM_COPY
#define FF_API_STREAM_COPY (LIBAVFORMAT_VERSION_MAJOR < 54)
#define FF_API_STREAM_COPY (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#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