diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-26 15:58:40 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-26 16:02:40 -0300 |
| commit | 318778de9ebec276cb9dfc65509231ca56590d13 (patch) | |
| tree | 795c3dc73c18c00f7ce2b09f91184e09d529d332 /libavformat | |
| parent | 2508e606fba86f2e460eebb045e29e1f069a4d72 (diff) | |
| parent | fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3 (diff) | |
| download | ffmpeg-streaming-318778de9ebec276cb9dfc65509231ca56590d13.zip ffmpeg-streaming-318778de9ebec276cb9dfc65509231ca56590d13.tar.gz | |
Merge commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3'
* commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3':
Mark some arrays that never change as const.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/hls.c | 4 | ||||
| -rw-r--r-- | libavformat/id3v2.c | 2 | ||||
| -rw-r--r-- | libavformat/id3v2.h | 2 | ||||
| -rw-r--r-- | libavformat/mxfdec.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 0995345..786934a 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1498,9 +1498,9 @@ static int select_cur_seq_no(HLSContext *c, struct playlist *pls) static int save_avio_options(AVFormatContext *s) { HLSContext *c = s->priv_data; - static const char *opts[] = { + static const char * const opts[] = { "headers", "http_proxy", "user_agent", "user-agent", "cookies", NULL }; - const char **opt = opts; + const char * const * opt = opts; uint8_t *buf; int ret = 0; diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 0534635..f15cefe 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -102,7 +102,7 @@ const char ff_id3v2_3_tags[][4] = { { 0 }, }; -const char *ff_id3v2_picture_types[21] = { +const char * const ff_id3v2_picture_types[21] = { "Other", "32x32 pixels 'file icon'", "Other file icon", diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h index 9d7bf1c..6e7a8c9 100644 --- a/libavformat/id3v2.h +++ b/libavformat/id3v2.h @@ -180,6 +180,6 @@ extern const char ff_id3v2_3_tags[][4]; extern const CodecMime ff_id3v2_mime_tags[]; -extern const char *ff_id3v2_picture_types[21]; +extern const char * const ff_id3v2_picture_types[21]; #endif /* AVFORMAT_ID3V2_H */ diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 476d284..1855f95 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1204,7 +1204,7 @@ static const MXFCodecUL mxf_data_essence_container_uls[] = { { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, }; -static const char* const mxf_data_essence_descriptor[] = { +static const char * const mxf_data_essence_descriptor[] = { "vbi_vanc_smpte_436M", }; |
