1. ffmpeg
  2. Commit d2a5c6f2104db563491be0d16b722a1f7bbe65e4
Browse code

Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2015/02/25 07:44:20
Showing 10 changed files
libavformat/rtpdec.c
History View file @ d2a5c6f
... ... 
@@ -852,7 +852,7 @@ int ff_parse_fmtp(AVFormatContext *s,
852 852 
                   int (*parse_fmtp)(AVFormatContext *s,
853 853 
                                     AVStream *stream,
854 854 
                                     PayloadContext *data,
855 
-                                    char *attr, char *value))
855 
+                                    const char *attr, const char *value))
856 856 
 {
857 857 
     char attr[256];
858 858 
     char *value;
libavformat/rtpdec.h
History View file @ d2a5c6f
... ... 
@@ -207,7 +207,7 @@ int ff_parse_fmtp(AVFormatContext *s,
207 207 
                   int (*parse_fmtp)(AVFormatContext *s,
208 208 
                                     AVStream *stream,
209 209 
                                     PayloadContext *data,
210 
-                                    char *attr, char *value));
210 
+                                    const char *attr, const char *value));
211 211
212 212 
 void ff_register_rtp_dynamic_payload_handlers(void);
213 213
libavformat/rtpdec_amr.c
History View file @ d2a5c6f
... ... 
@@ -137,7 +137,7 @@ static int amr_handle_packet(AVFormatContext *ctx, PayloadContext *data,
137 137
138 138 
 static int amr_parse_fmtp(AVFormatContext *s,
139 139 
                           AVStream *stream, PayloadContext *data,
140 
-                          char *attr, char *value)
140 
+                          const char *attr, const char *value)
141 141 
 {
142 142 
     /* Some AMR SDP configurations contain "octet-align", without
143 143 
      * the trailing =1. Therefore, if the value is empty,
... ... 
@@ -146,7 +146,7 @@ static int amr_parse_fmtp(AVFormatContext *s,
146 146 
     if (!strcmp(value, "")) {
147 147 
         av_log(s, AV_LOG_WARNING, "AMR fmtp attribute %s had "
148 148 
                                   "nonstandard empty value\n", attr);
149 
-        strcpy(value, "1");
149 
+        value = "1";
150 150 
     }
151 151 
     if (!strcmp(attr, "octet-align"))
152 152 
         data->octet_align = atoi(value);
libavformat/rtpdec_dv.c
History View file @ d2a5c6f
... ... 
@@ -48,7 +48,7 @@ static av_cold void dv_free_context(PayloadContext *data)
48 48 
 static av_cold int dv_sdp_parse_fmtp_config(AVFormatContext *s,
49 49 
                                             AVStream *stream,
50 50 
                                             PayloadContext *dv_data,
51 
-                                            char *attr, char *value)
51 
+                                            const char *attr, const char *value)
52 52 
 {
53 53 
     /* does the DV stream include audio? */
54 54 
     if (!strcmp(attr, "audio") && !strcmp(value, "bundled"))
libavformat/rtpdec_h264.c
History View file @ d2a5c6f
... ... 
@@ -144,7 +144,7 @@ int ff_h264_parse_sprop_parameter_sets(AVFormatContext *s,
144 144 
 static int sdp_parse_fmtp_config_h264(AVFormatContext *s,
145 145 
                                       AVStream *stream,
146 146 
                                       PayloadContext *h264_data,
147 
-                                      char *attr, char *value)
147 
+                                      const char *attr, const char *value)
148 148 
 {
149 149 
     AVCodecContext *codec = stream->codec;
150 150
libavformat/rtpdec_hevc.c
History View file @ d2a5c6f
... ... 
@@ -49,7 +49,7 @@ static const uint8_t start_sequence[] = { 0x00, 0x00, 0x00, 0x01 };
49 49 
 static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s,
50 50 
                                               AVStream *stream,
51 51 
                                               PayloadContext *hevc_data,
52 
-                                              char *attr, char *value)
52 
+                                              const char *attr, const char *value)
53 53 
 {
54 54 
     /* profile-space: 0-3 */
55 55 
     /* profile-id: 0-31 */
libavformat/rtpdec_ilbc.c
History View file @ d2a5c6f
... ... 
@@ -25,7 +25,7 @@
25 25
26 26 
 static int ilbc_parse_fmtp(AVFormatContext *s,
27 27 
                            AVStream *stream, PayloadContext *data,
28 
-                           char *attr, char *value)
28 
+                           const char *attr, const char *value)
29 29 
 {
30 30 
     if (!strcmp(attr, "mode")) {
31 31 
         int mode = atoi(value);
libavformat/rtpdec_latm.c
History View file @ d2a5c6f
... ... 
@@ -137,7 +137,7 @@ end:
137 137
138 138 
 static int parse_fmtp(AVFormatContext *s,
139 139 
                       AVStream *stream, PayloadContext *data,
140 
-                      char *attr, char *value)
140 
+                      const char *attr, const char *value)
141 141 
 {
142 142 
     int res;
143 143
libavformat/rtpdec_mpeg4.c
History View file @ d2a5c6f
... ... 
@@ -273,7 +273,7 @@ static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data,
273 273
274 274 
 static int parse_fmtp(AVFormatContext *s,
275 275 
                       AVStream *stream, PayloadContext *data,
276 
-                      char *attr, char *value)
276 
+                      const char *attr, const char *value)
277 277 
 {
278 278 
     AVCodecContext *codec = stream->codec;
279 279 
     int res, i;
libavformat/rtpdec_xiph.c
History View file @ d2a5c6f
... ... 
@@ -295,7 +295,7 @@ parse_packed_headers(const uint8_t * packed_headers,
295 295 
 static int xiph_parse_fmtp_pair(AVFormatContext *s,
296 296 
                                 AVStream* stream,
297 297 
                                 PayloadContext *xiph_data,
298 
-                                char *attr, char *value)
298 
+                                const char *attr, const char *value)
299 299 
 {
300 300 
     AVCodecContext *codec = stream->codec;
301 301 
     int result = 0;