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
25b32586
Commit
25b32586
authored
Feb 19, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: add an AVStream field for exporting stream-global side data
parent
0e2c3ee9
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
2 deletions
+34
-2
APIchanges
doc/APIchanges
+4
-0
avformat.h
libavformat/avformat.h
+22
-0
utils.c
libavformat/utils.c
+7
-1
version.h
libavformat/version.h
+1
-1
No files found.
doc/APIchanges
View file @
25b32586
...
...
@@ -13,6 +13,10 @@ libavutil: 2013-12-xx
API changes, most recent first:
2014-02-xx - xxxxxxx - lavf 55.13.0 - avformat.h
Add AVStream.side_data and AVStream.nb_side_data for exporting stream-global
side data (e.g. replaygain tags, video rotation)
2014-02-xx - xxxxxxx - lavc 55.35.0 - avcodec.h
Give the name AVPacketSideData to the previously anonymous struct used for
AVPacket.side_data.
...
...
libavformat/avformat.h
View file @
25b32586
...
...
@@ -755,6 +755,28 @@ typedef struct AVStream {
*/
AVPacket
attached_pic
;
/**
* An array of side data that applies to the whole stream (i.e. the
* container does not allow it to change between packets).
*
* There may be no overlap between the side data in this array and side data
* in the packets. I.e. a given side data is either exported by the muxer
* (demuxing) / set by the caller (muxing) in this array, then it never
* appears in the packets, or the side data is exported / sent through
* the packets (always in the first packet where the value becomes known or
* changes), then it does not appear in this array.
*
* - demuxing: Set by libavformat when the stream is created.
* - muxing: May be set by the caller before avformat_write_header().
*
* Freed by libavformat in avformat_free_context().
*/
AVPacketSideData
*
side_data
;
/**
* The number of elements in the AVStream.side_data array.
*/
int
nb_side_data
;
/*****************************************************************
* All fields below this line are not part of the public API. They
* may not be used outside of libavformat and can be changed and
...
...
libavformat/utils.c
View file @
25b32586
...
...
@@ -2595,7 +2595,7 @@ int av_read_pause(AVFormatContext *s)
void
avformat_free_context
(
AVFormatContext
*
s
)
{
int
i
;
int
i
,
j
;
AVStream
*
st
;
av_opt_free
(
s
);
...
...
@@ -2605,6 +2605,12 @@ void avformat_free_context(AVFormatContext *s)
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
)
{
/* free all data in a stream component */
st
=
s
->
streams
[
i
];
for
(
j
=
0
;
j
<
st
->
nb_side_data
;
j
++
)
av_freep
(
&
st
->
side_data
[
j
].
data
);
av_freep
(
&
st
->
side_data
);
st
->
nb_side_data
=
0
;
if
(
st
->
parser
)
{
av_parser_close
(
st
->
parser
);
}
...
...
libavformat/version.h
View file @
25b32586
...
...
@@ -30,7 +30,7 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 1
2
#define LIBAVFORMAT_VERSION_MINOR 1
3
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
...
...
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