generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions

Browse Source 
This makes it clear that the individual parsing functions can't
touch the parsed out value.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2015-02-24 12:32:17 +02:00
parent ac0e54fda9
commit ec96a89c3e
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtpdec.c
View File

@ -844,7 +844,7 @@ int ff_parse_fmtp(AVFormatContext *s,
int (*parse_fmtp)(AVFormatContext *s,
AVStream *stream,
PayloadContext *data,
char *attr, char *value))
const char *attr, const char *value))
{
char attr[256];
char *value;

2
libavformat/rtpdec.h
View File

@ -207,7 +207,7 @@ int ff_parse_fmtp(AVFormatContext *s,
int (*parse_fmtp)(AVFormatContext *s,
AVStream *stream,
PayloadContext *data,
char *attr, char *value));
const char *attr, const char *value));
void ff_register_rtp_dynamic_payload_handlers(void);

4
libavformat/rtpdec_amr.c
View File

@ -137,7 +137,7 @@ static int amr_handle_packet(AVFormatContext *ctx, PayloadContext *data,
static int amr_parse_fmtp(AVFormatContext *s,
AVStream *stream, PayloadContext *data,
char *attr, char *value)
const char *attr, const char *value)
{
/* Some AMR SDP configurations contain "octet-align", without
* the trailing =1. Therefore, if the value is empty,
@ -146,7 +146,7 @@ static int amr_parse_fmtp(AVFormatContext *s,
if (!strcmp(value, "")) {
av_log(s, AV_LOG_WARNING, "AMR fmtp attribute %s had "
"nonstandard empty value\n", attr);
strcpy(value, "1");
value = "1";
}
if (!strcmp(attr, "octet-align"))
data->octet_align = atoi(value);

2
libavformat/rtpdec_dv.c
View File

@ -48,7 +48,7 @@ static av_cold void dv_free_context(PayloadContext *data)
static av_cold int dv_sdp_parse_fmtp_config(AVFormatContext *s,
AVStream *stream,
PayloadContext *dv_data,
char *attr, char *value)
const char *attr, const char *value)
{
/* does the DV stream include audio? */
if (!strcmp(attr, "audio") && !strcmp(value, "bundled"))

2
libavformat/rtpdec_h264.c
View File

@ -144,7 +144,7 @@ int ff_h264_parse_sprop_parameter_sets(AVFormatContext *s,
static int sdp_parse_fmtp_config_h264(AVFormatContext *s,
AVStream *stream,
PayloadContext *h264_data,
char *attr, char *value)
const char *attr, const char *value)
{
AVCodecContext *codec = stream->codec;

2
libavformat/rtpdec_hevc.c
View File

@ -46,7 +46,7 @@ static const uint8_t start_sequence[] = { 0x00, 0x00, 0x00, 0x01 };
static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s,
AVStream *stream,
PayloadContext *hevc_data,
char *attr, char *value)
const char *attr, const char *value)
{
/* profile-space: 0-3 */
/* profile-id: 0-31 */

2
libavformat/rtpdec_ilbc.c
View File

@ -25,7 +25,7 @@
static int ilbc_parse_fmtp(AVFormatContext *s,
AVStream *stream, PayloadContext *data,
char *attr, char *value)
const char *attr, const char *value)
{
if (!strcmp(attr, "mode")) {
int mode = atoi(value);

2
libavformat/rtpdec_latm.c
View File

@ -140,7 +140,7 @@ end:
static int parse_fmtp(AVFormatContext *s,
AVStream *stream, PayloadContext *data,
char *attr, char *value)
const char *attr, const char *value)
{
int res;

2
libavformat/rtpdec_mpeg4.c
View File

@ -274,7 +274,7 @@ static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data,
static int parse_fmtp(AVFormatContext *s,
AVStream *stream, PayloadContext *data,
char *attr, char *value)
const char *attr, const char *value)
{
AVCodecContext *codec = stream->codec;
int res, i;

2
libavformat/rtpdec_xiph.c
View File

@ -295,7 +295,7 @@ parse_packed_headers(const uint8_t * packed_headers,
static int xiph_parse_fmtp_pair(AVFormatContext *s,
AVStream* stream,
PayloadContext *xiph_data,
char *attr, char *value)
const char *attr, const char *value)
{
AVCodecContext *codec = stream->codec;
int result = 0;