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
b89081e0
Commit
b89081e0
authored
Oct 22, 2017
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: remove dead av_stream_get_side_data() cruft
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
ca4df37f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
13 deletions
+0
-13
avformat.h
libavformat/avformat.h
+0
-5
utils.c
libavformat/utils.c
+0
-5
version.h
libavformat/version.h
+0
-3
No files found.
libavformat/avformat.h
View file @
b89081e0
...
@@ -2082,13 +2082,8 @@ uint8_t *av_stream_new_side_data(AVStream *stream,
...
@@ -2082,13 +2082,8 @@ uint8_t *av_stream_new_side_data(AVStream *stream,
* @param size pointer for side information size to store (optional)
* @param size pointer for side information size to store (optional)
* @return pointer to data if present or NULL otherwise
* @return pointer to data if present or NULL otherwise
*/
*/
#if FF_API_NOCONST_GET_SIDE_DATA
uint8_t
*
av_stream_get_side_data
(
AVStream
*
stream
,
enum
AVPacketSideDataType
type
,
int
*
size
);
#else
uint8_t
*
av_stream_get_side_data
(
const
AVStream
*
stream
,
uint8_t
*
av_stream_get_side_data
(
const
AVStream
*
stream
,
enum
AVPacketSideDataType
type
,
int
*
size
);
enum
AVPacketSideDataType
type
,
int
*
size
);
#endif
AVProgram
*
av_new_program
(
AVFormatContext
*
s
,
int
id
);
AVProgram
*
av_new_program
(
AVFormatContext
*
s
,
int
id
);
...
...
libavformat/utils.c
View file @
b89081e0
...
@@ -5244,13 +5244,8 @@ int ff_generate_avci_extradata(AVStream *st)
...
@@ -5244,13 +5244,8 @@ int ff_generate_avci_extradata(AVStream *st)
return
0
;
return
0
;
}
}
#if FF_API_NOCONST_GET_SIDE_DATA
uint8_t
*
av_stream_get_side_data
(
AVStream
*
st
,
enum
AVPacketSideDataType
type
,
int
*
size
)
#else
uint8_t
*
av_stream_get_side_data
(
const
AVStream
*
st
,
uint8_t
*
av_stream_get_side_data
(
const
AVStream
*
st
,
enum
AVPacketSideDataType
type
,
int
*
size
)
enum
AVPacketSideDataType
type
,
int
*
size
)
#endif
{
{
int
i
;
int
i
;
...
...
libavformat/version.h
View file @
b89081e0
...
@@ -67,9 +67,6 @@
...
@@ -67,9 +67,6 @@
#ifndef FF_API_LAVF_AVCTX
#ifndef FF_API_LAVF_AVCTX
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#endif
#ifndef FF_API_NOCONST_GET_SIDE_DATA
#define FF_API_NOCONST_GET_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_HTTP_USER_AGENT
#ifndef FF_API_HTTP_USER_AGENT
#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59)
#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59)
#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