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
c3675dfe
Commit
c3675dfe
authored
Apr 08, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: rename avf_sdp_create to av_sdp_create.
The new name is more consistent with the rest of the API.
parent
a9bf9d8e
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
7 deletions
+21
-7
ffmpeg.c
ffmpeg.c
+1
-1
ffserver.c
ffserver.c
+1
-1
avformat.h
libavformat/avformat.h
+5
-1
rtspenc.c
libavformat/rtspenc.c
+1
-1
sapenc.c
libavformat/sapenc.c
+1
-1
sdp.c
libavformat/sdp.c
+9
-2
version.h
libavformat/version.h
+3
-0
No files found.
ffmpeg.c
View file @
c3675dfe
...
...
@@ -1797,7 +1797,7 @@ static void print_sdp(AVFormatContext **avc, int n)
{
char
sdp
[
2048
];
av
f
_sdp_create
(
avc
,
n
,
sdp
,
sizeof
(
sdp
));
av_sdp_create
(
avc
,
n
,
sdp
,
sizeof
(
sdp
));
printf
(
"SDP:
\n
%s
\n
"
,
sdp
);
fflush
(
stdout
);
}
...
...
ffserver.c
View file @
c3675dfe
...
...
@@ -2957,7 +2957,7 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
avc
->
streams
[
i
]
->
codec
=
stream
->
streams
[
i
]
->
codec
;
}
*
pbuffer
=
av_mallocz
(
2048
);
av
f
_sdp_create
(
&
avc
,
1
,
*
pbuffer
,
2048
);
av_sdp_create
(
&
avc
,
1
,
*
pbuffer
,
2048
);
sdp_done:
#if !FF_API_MAX_STREAMS
...
...
libavformat/avformat.h
View file @
c3675dfe
...
...
@@ -1558,7 +1558,11 @@ int av_filename_number_test(const char *filename);
* @param size the size of the buffer
* @return 0 if OK, AVERROR_xxx on error
*/
int
avf_sdp_create
(
AVFormatContext
*
ac
[],
int
n_files
,
char
*
buff
,
int
size
);
int
av_sdp_create
(
AVFormatContext
*
ac
[],
int
n_files
,
char
*
buff
,
int
size
);
#if FF_API_SDP_CREATE
attribute_deprecated
int
avf_sdp_create
(
AVFormatContext
*
ac
[],
int
n_files
,
char
*
buff
,
int
size
);
#endif
/**
* Return a positive value if the given filename has one of the given
...
...
libavformat/rtspenc.c
View file @
c3675dfe
...
...
@@ -66,7 +66,7 @@ int ff_rtsp_setup_output_streams(AVFormatContext *s, const char *addr)
ff_url_join
(
sdp_ctx
.
filename
,
sizeof
(
sdp_ctx
.
filename
),
"rtsp"
,
NULL
,
addr
,
-
1
,
NULL
);
ctx_array
[
0
]
=
&
sdp_ctx
;
if
(
av
f
_sdp_create
(
ctx_array
,
1
,
sdp
,
SDP_MAX_SIZE
))
{
if
(
av_sdp_create
(
ctx_array
,
1
,
sdp
,
SDP_MAX_SIZE
))
{
av_free
(
sdp
);
return
AVERROR_INVALIDDATA
;
}
...
...
libavformat/sapenc.c
View file @
c3675dfe
...
...
@@ -208,7 +208,7 @@ static int sap_write_header(AVFormatContext *s)
av_strlcpy
(
&
sap
->
ann
[
pos
],
"application/sdp"
,
sap
->
ann_size
-
pos
);
pos
+=
strlen
(
&
sap
->
ann
[
pos
])
+
1
;
if
(
av
f
_sdp_create
(
contexts
,
s
->
nb_streams
,
&
sap
->
ann
[
pos
],
if
(
av_sdp_create
(
contexts
,
s
->
nb_streams
,
&
sap
->
ann
[
pos
],
sap
->
ann_size
-
pos
))
{
ret
=
AVERROR_INVALIDDATA
;
goto
fail
;
...
...
libavformat/sdp.c
View file @
c3675dfe
...
...
@@ -474,7 +474,7 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *des
sdp_write_media_attributes
(
buff
,
size
,
c
,
payload_type
);
}
int
av
f
_sdp_create
(
AVFormatContext
*
ac
[],
int
n_files
,
char
*
buff
,
int
size
)
int
av_sdp_create
(
AVFormatContext
*
ac
[],
int
n_files
,
char
*
buff
,
int
size
)
{
AVMetadataTag
*
title
=
av_metadata_get
(
ac
[
0
]
->
metadata
,
"title"
,
NULL
,
0
);
struct
sdp_session_level
s
;
...
...
@@ -531,7 +531,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size)
return
0
;
}
#else
int
av
f
_sdp_create
(
AVFormatContext
*
ac
[],
int
n_files
,
char
*
buff
,
int
size
)
int
av_sdp_create
(
AVFormatContext
*
ac
[],
int
n_files
,
char
*
buff
,
int
size
)
{
return
AVERROR
(
ENOSYS
);
}
...
...
@@ -540,3 +540,10 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, const char *des
{
}
#endif
#if FF_API_SDP_CREATE
int
avf_sdp_create
(
AVFormatContext
*
ac
[],
int
n_files
,
char
*
buff
,
int
size
)
{
return
av_sdp_create
(
ac
,
n_files
,
buff
,
size
);
}
#endif
libavformat/version.h
View file @
c3675dfe
...
...
@@ -107,5 +107,8 @@
#ifndef FF_API_GUESS_IMG2_CODEC
#define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_SDP_CREATE
#define FF_API_SDP_CREATE (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
#endif //AVFORMAT_VERSION_H
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