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
9461e4bc
Commit
9461e4bc
authored
Mar 20, 2019
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: Constify AVOutputFormat pointer.
parent
4602456c
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
30 additions
and
22 deletions
+30
-22
avformat.h
libavformat/avformat.h
+10
-5
fifo.c
libavformat/fifo.c
+2
-2
format.c
libavformat/format.c
+3
-3
hdsenc.c
libavformat/hdsenc.c
+1
-1
hlsenc.c
libavformat/hlsenc.c
+2
-2
mux.c
libavformat/mux.c
+2
-2
rtp.c
libavformat/rtp.c
+1
-1
rtpenc_chain.c
libavformat/rtpenc_chain.c
+1
-1
rtpenc_mpegts.c
libavformat/rtpenc_mpegts.c
+2
-2
segment.c
libavformat/segment.c
+1
-1
smoothstreamingenc.c
libavformat/smoothstreamingenc.c
+1
-1
version.h
libavformat/version.h
+3
-0
webm_chunk.c
libavformat/webm_chunk.c
+1
-1
No files found.
libavformat/avformat.h
View file @
9461e4bc
...
@@ -532,7 +532,12 @@ typedef struct AVOutputFormat {
...
@@ -532,7 +532,12 @@ typedef struct AVOutputFormat {
* New public fields should be added right above.
* New public fields should be added right above.
*****************************************************************
*****************************************************************
*/
*/
struct
AVOutputFormat
*
next
;
#if FF_API_AVIOFORMAT
#define ff_const59
#else
#define ff_const59 const
#endif
ff_const59
struct
AVOutputFormat
*
next
;
/**
/**
* size of private data so that it can be allocated in the wrapper
* size of private data so that it can be allocated in the wrapper
*/
*/
...
@@ -1353,7 +1358,7 @@ typedef struct AVFormatContext {
...
@@ -1353,7 +1358,7 @@ typedef struct AVFormatContext {
*
*
* Muxing only, must be set by the caller before avformat_write_header().
* Muxing only, must be set by the caller before avformat_write_header().
*/
*/
struct
AVOutputFormat
*
oformat
;
ff_const59
struct
AVOutputFormat
*
oformat
;
/**
/**
* Format private data. This is an AVOptions-enabled struct
* Format private data. This is an AVOptions-enabled struct
...
@@ -2211,7 +2216,7 @@ AVProgram *av_new_program(AVFormatContext *s, int id);
...
@@ -2211,7 +2216,7 @@ AVProgram *av_new_program(AVFormatContext *s, int id);
* @return >= 0 in case of success, a negative AVERROR code in case of
* @return >= 0 in case of success, a negative AVERROR code in case of
* failure
* failure
*/
*/
int
avformat_alloc_output_context2
(
AVFormatContext
**
ctx
,
AVOutputFormat
*
oformat
,
int
avformat_alloc_output_context2
(
AVFormatContext
**
ctx
,
ff_const59
AVOutputFormat
*
oformat
,
const
char
*
format_name
,
const
char
*
filename
);
const
char
*
format_name
,
const
char
*
filename
);
/**
/**
...
@@ -2687,14 +2692,14 @@ int av_write_trailer(AVFormatContext *s);
...
@@ -2687,14 +2692,14 @@ int av_write_trailer(AVFormatContext *s);
* @param mime_type if non-NULL checks if mime_type matches with the
* @param mime_type if non-NULL checks if mime_type matches with the
* MIME type of the registered formats
* MIME type of the registered formats
*/
*/
AVOutputFormat
*
av_guess_format
(
const
char
*
short_name
,
ff_const59
AVOutputFormat
*
av_guess_format
(
const
char
*
short_name
,
const
char
*
filename
,
const
char
*
filename
,
const
char
*
mime_type
);
const
char
*
mime_type
);
/**
/**
* Guess the codec ID based upon muxer and filename.
* Guess the codec ID based upon muxer and filename.
*/
*/
enum
AVCodecID
av_guess_codec
(
AVOutputFormat
*
fmt
,
const
char
*
short_name
,
enum
AVCodecID
av_guess_codec
(
ff_const59
AVOutputFormat
*
fmt
,
const
char
*
short_name
,
const
char
*
filename
,
const
char
*
mime_type
,
const
char
*
filename
,
const
char
*
mime_type
,
enum
AVMediaType
type
);
enum
AVMediaType
type
);
...
...
libavformat/fifo.c
View file @
9461e4bc
...
@@ -442,7 +442,7 @@ static void *fifo_consumer_thread(void *data)
...
@@ -442,7 +442,7 @@ static void *fifo_consumer_thread(void *data)
return
NULL
;
return
NULL
;
}
}
static
int
fifo_mux_init
(
AVFormatContext
*
avf
,
AVOutputFormat
*
oformat
,
static
int
fifo_mux_init
(
AVFormatContext
*
avf
,
ff_const59
AVOutputFormat
*
oformat
,
const
char
*
filename
)
const
char
*
filename
)
{
{
FifoContext
*
fifo
=
avf
->
priv_data
;
FifoContext
*
fifo
=
avf
->
priv_data
;
...
@@ -481,7 +481,7 @@ static int fifo_mux_init(AVFormatContext *avf, AVOutputFormat *oformat,
...
@@ -481,7 +481,7 @@ static int fifo_mux_init(AVFormatContext *avf, AVOutputFormat *oformat,
static
int
fifo_init
(
AVFormatContext
*
avf
)
static
int
fifo_init
(
AVFormatContext
*
avf
)
{
{
FifoContext
*
fifo
=
avf
->
priv_data
;
FifoContext
*
fifo
=
avf
->
priv_data
;
AVOutputFormat
*
oformat
;
ff_const59
AVOutputFormat
*
oformat
;
int
ret
=
0
;
int
ret
=
0
;
if
(
fifo
->
recovery_wait_streamtime
&&
!
fifo
->
drop_pkts_on_overflow
)
{
if
(
fifo
->
recovery_wait_streamtime
&&
!
fifo
->
drop_pkts_on_overflow
)
{
...
...
libavformat/format.c
View file @
9461e4bc
...
@@ -48,7 +48,7 @@ int av_match_ext(const char *filename, const char *extensions)
...
@@ -48,7 +48,7 @@ int av_match_ext(const char *filename, const char *extensions)
return
0
;
return
0
;
}
}
AVOutputFormat
*
av_guess_format
(
const
char
*
short_name
,
const
char
*
filename
,
ff_const59
AVOutputFormat
*
av_guess_format
(
const
char
*
short_name
,
const
char
*
filename
,
const
char
*
mime_type
)
const
char
*
mime_type
)
{
{
const
AVOutputFormat
*
fmt
=
NULL
;
const
AVOutputFormat
*
fmt
=
NULL
;
...
@@ -84,12 +84,12 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
...
@@ -84,12 +84,12 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename,
return
fmt_found
;
return
fmt_found
;
}
}
enum
AVCodecID
av_guess_codec
(
AVOutputFormat
*
fmt
,
const
char
*
short_name
,
enum
AVCodecID
av_guess_codec
(
ff_const59
AVOutputFormat
*
fmt
,
const
char
*
short_name
,
const
char
*
filename
,
const
char
*
mime_type
,
const
char
*
filename
,
const
char
*
mime_type
,
enum
AVMediaType
type
)
enum
AVMediaType
type
)
{
{
if
(
av_match_name
(
"segment"
,
fmt
->
name
)
||
av_match_name
(
"ssegment"
,
fmt
->
name
))
{
if
(
av_match_name
(
"segment"
,
fmt
->
name
)
||
av_match_name
(
"ssegment"
,
fmt
->
name
))
{
AVOutputFormat
*
fmt2
=
av_guess_format
(
NULL
,
filename
,
NULL
);
ff_const59
AVOutputFormat
*
fmt2
=
av_guess_format
(
NULL
,
filename
,
NULL
);
if
(
fmt2
)
if
(
fmt2
)
fmt
=
fmt2
;
fmt
=
fmt2
;
}
}
...
...
libavformat/hdsenc.c
View file @
9461e4bc
...
@@ -315,7 +315,7 @@ static int hds_write_header(AVFormatContext *s)
...
@@ -315,7 +315,7 @@ static int hds_write_header(AVFormatContext *s)
{
{
HDSContext
*
c
=
s
->
priv_data
;
HDSContext
*
c
=
s
->
priv_data
;
int
ret
=
0
,
i
;
int
ret
=
0
,
i
;
AVOutputFormat
*
oformat
;
ff_const59
AVOutputFormat
*
oformat
;
if
(
mkdir
(
s
->
url
,
0777
)
==
-
1
&&
errno
!=
EEXIST
)
{
if
(
mkdir
(
s
->
url
,
0777
)
==
-
1
&&
errno
!=
EEXIST
)
{
ret
=
AVERROR
(
errno
);
ret
=
AVERROR
(
errno
);
...
...
libavformat/hlsenc.c
View file @
9461e4bc
...
@@ -110,8 +110,8 @@ typedef struct VariantStream {
...
@@ -110,8 +110,8 @@ typedef struct VariantStream {
unsigned
var_stream_idx
;
unsigned
var_stream_idx
;
unsigned
number
;
unsigned
number
;
int64_t
sequence
;
int64_t
sequence
;
AVOutputFormat
*
oformat
;
ff_const59
AVOutputFormat
*
oformat
;
AVOutputFormat
*
vtt_oformat
;
ff_const59
AVOutputFormat
*
vtt_oformat
;
AVIOContext
*
out
;
AVIOContext
*
out
;
int
packets_written
;
int
packets_written
;
int
init_range_length
;
int
init_range_length
;
...
...
libavformat/mux.c
View file @
9461e4bc
...
@@ -145,7 +145,7 @@ enum AVChromaLocation ff_choose_chroma_location(AVFormatContext *s, AVStream *st
...
@@ -145,7 +145,7 @@ enum AVChromaLocation ff_choose_chroma_location(AVFormatContext *s, AVStream *st
}
}
int
avformat_alloc_output_context2
(
AVFormatContext
**
avctx
,
AVOutputFormat
*
oformat
,
int
avformat_alloc_output_context2
(
AVFormatContext
**
avctx
,
ff_const59
AVOutputFormat
*
oformat
,
const
char
*
format
,
const
char
*
filename
)
const
char
*
format
,
const
char
*
filename
)
{
{
AVFormatContext
*
s
=
avformat_alloc_context
();
AVFormatContext
*
s
=
avformat_alloc_context
();
...
@@ -246,7 +246,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
...
@@ -246,7 +246,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
AVStream
*
st
;
AVStream
*
st
;
AVDictionary
*
tmp
=
NULL
;
AVDictionary
*
tmp
=
NULL
;
AVCodecParameters
*
par
=
NULL
;
AVCodecParameters
*
par
=
NULL
;
AVOutputFormat
*
of
=
s
->
oformat
;
const
AVOutputFormat
*
of
=
s
->
oformat
;
const
AVCodecDescriptor
*
desc
;
const
AVCodecDescriptor
*
desc
;
AVDictionaryEntry
*
e
;
AVDictionaryEntry
*
e
;
...
...
libavformat/rtp.c
View file @
9461e4bc
...
@@ -91,7 +91,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt,
...
@@ -91,7 +91,7 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt,
AVCodecParameters
*
par
,
int
idx
)
AVCodecParameters
*
par
,
int
idx
)
{
{
int
i
;
int
i
;
AVOutputFormat
*
ofmt
=
fmt
?
fmt
->
oformat
:
NULL
;
const
AVOutputFormat
*
ofmt
=
fmt
?
fmt
->
oformat
:
NULL
;
/* Was the payload type already specified for the RTP muxer? */
/* Was the payload type already specified for the RTP muxer? */
if
(
ofmt
&&
ofmt
->
priv_class
&&
fmt
->
priv_data
)
{
if
(
ofmt
&&
ofmt
->
priv_class
&&
fmt
->
priv_data
)
{
...
...
libavformat/rtpenc_chain.c
View file @
9461e4bc
...
@@ -31,7 +31,7 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
...
@@ -31,7 +31,7 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
{
{
AVFormatContext
*
rtpctx
=
NULL
;
AVFormatContext
*
rtpctx
=
NULL
;
int
ret
;
int
ret
;
AVOutputFormat
*
rtp_format
=
av_guess_format
(
"rtp"
,
NULL
,
NULL
);
ff_const59
AVOutputFormat
*
rtp_format
=
av_guess_format
(
"rtp"
,
NULL
,
NULL
);
uint8_t
*
rtpflags
;
uint8_t
*
rtpflags
;
AVDictionary
*
opts
=
NULL
;
AVDictionary
*
opts
=
NULL
;
...
...
libavformat/rtpenc_mpegts.c
View file @
9461e4bc
...
@@ -48,8 +48,8 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
...
@@ -48,8 +48,8 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
{
{
struct
MuxChain
*
chain
=
s
->
priv_data
;
struct
MuxChain
*
chain
=
s
->
priv_data
;
AVFormatContext
*
mpegts_ctx
=
NULL
,
*
rtp_ctx
=
NULL
;
AVFormatContext
*
mpegts_ctx
=
NULL
,
*
rtp_ctx
=
NULL
;
AVOutputFormat
*
mpegts_format
=
av_guess_format
(
"mpegts"
,
NULL
,
NULL
);
ff_const59
AVOutputFormat
*
mpegts_format
=
av_guess_format
(
"mpegts"
,
NULL
,
NULL
);
AVOutputFormat
*
rtp_format
=
av_guess_format
(
"rtp"
,
NULL
,
NULL
);
ff_const59
AVOutputFormat
*
rtp_format
=
av_guess_format
(
"rtp"
,
NULL
,
NULL
);
int
i
,
ret
=
AVERROR
(
ENOMEM
);
int
i
,
ret
=
AVERROR
(
ENOMEM
);
AVStream
*
st
;
AVStream
*
st
;
...
...
libavformat/segment.c
View file @
9461e4bc
...
@@ -72,7 +72,7 @@ typedef struct SegmentContext {
...
@@ -72,7 +72,7 @@ typedef struct SegmentContext {
int
segment_idx_wrap
;
///< number after which the index wraps
int
segment_idx_wrap
;
///< number after which the index wraps
int
segment_idx_wrap_nb
;
///< number of time the index has wraped
int
segment_idx_wrap_nb
;
///< number of time the index has wraped
int
segment_count
;
///< number of segment files already written
int
segment_count
;
///< number of segment files already written
AVOutputFormat
*
oformat
;
ff_const59
AVOutputFormat
*
oformat
;
AVFormatContext
*
avf
;
AVFormatContext
*
avf
;
char
*
format
;
///< format to use for output segment files
char
*
format
;
///< format to use for output segment files
char
*
format_options_str
;
///< format options to use for output segment files
char
*
format_options_str
;
///< format options to use for output segment files
...
...
libavformat/smoothstreamingenc.c
View file @
9461e4bc
...
@@ -293,7 +293,7 @@ static int ism_write_header(AVFormatContext *s)
...
@@ -293,7 +293,7 @@ static int ism_write_header(AVFormatContext *s)
{
{
SmoothStreamingContext
*
c
=
s
->
priv_data
;
SmoothStreamingContext
*
c
=
s
->
priv_data
;
int
ret
=
0
,
i
;
int
ret
=
0
,
i
;
AVOutputFormat
*
oformat
;
ff_const59
AVOutputFormat
*
oformat
;
if
(
mkdir
(
s
->
url
,
0777
)
==
-
1
&&
errno
!=
EEXIST
)
{
if
(
mkdir
(
s
->
url
,
0777
)
==
-
1
&&
errno
!=
EEXIST
)
{
ret
=
AVERROR
(
errno
);
ret
=
AVERROR
(
errno
);
...
...
libavformat/version.h
View file @
9461e4bc
...
@@ -103,6 +103,9 @@
...
@@ -103,6 +103,9 @@
#ifndef FF_API_LAVF_MP4A_LATM
#ifndef FF_API_LAVF_MP4A_LATM
#define FF_API_LAVF_MP4A_LATM (LIBAVFORMAT_VERSION_MAJOR < 59)
#define FF_API_LAVF_MP4A_LATM (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#endif
#ifndef FF_API_AVIOFORMAT
#define FF_API_AVIOFORMAT (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_R_FRAME_RATE
#ifndef FF_API_R_FRAME_RATE
...
...
libavformat/webm_chunk.c
View file @
9461e4bc
...
@@ -53,7 +53,7 @@ typedef struct WebMChunkContext {
...
@@ -53,7 +53,7 @@ typedef struct WebMChunkContext {
char
*
http_method
;
char
*
http_method
;
uint64_t
duration_written
;
uint64_t
duration_written
;
int
prev_pts
;
int
prev_pts
;
AVOutputFormat
*
oformat
;
ff_const59
AVOutputFormat
*
oformat
;
AVFormatContext
*
avf
;
AVFormatContext
*
avf
;
}
WebMChunkContext
;
}
WebMChunkContext
;
...
...
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