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
ffd71c9c
Commit
ffd71c9c
authored
Jun 27, 2016
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: mark stream as const pointer in av_stream_get_side_data() for next bump
parent
b2016189
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
avformat.h
libavformat/avformat.h
+5
-0
utils.c
libavformat/utils.c
+7
-2
version.h
libavformat/version.h
+5
-2
No files found.
libavformat/avformat.h
View file @
ffd71c9c
...
...
@@ -2053,8 +2053,13 @@ uint8_t *av_stream_new_side_data(AVStream *stream,
* @param size pointer for side information size to store (optional)
* @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
,
enum
AVPacketSideDataType
type
,
int
*
size
);
#endif
AVProgram
*
av_new_program
(
AVFormatContext
*
s
,
int
id
);
...
...
libavformat/utils.c
View file @
ffd71c9c
...
...
@@ -5007,8 +5007,13 @@ int ff_generate_avci_extradata(AVStream *st)
return
0
;
}
uint8_t
*
av_stream_get_side_data
(
AVStream
*
st
,
enum
AVPacketSideDataType
type
,
int
*
size
)
#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
,
enum
AVPacketSideDataType
type
,
int
*
size
)
#endif
{
int
i
;
...
...
libavformat/version.h
View file @
ffd71c9c
...
...
@@ -32,8 +32,8 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you belive might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 4
6
#define LIBAVFORMAT_VERSION_MICRO 10
1
#define LIBAVFORMAT_VERSION_MINOR 4
7
#define LIBAVFORMAT_VERSION_MICRO 10
0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
@@ -79,6 +79,9 @@
#ifndef FF_API_LAVF_AVCTX
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_NOCONST_GET_SIDE_DATA
#define FF_API_NOCONST_GET_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_R_FRAME_RATE
#define FF_API_R_FRAME_RATE 1
...
...
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