History

Merge commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3'

* commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3': Mark some arrays that never change as const.

James Almer committed 9 years ago

Commit 318778d2 parents 2508e60 fd9212f26 files · +64 −64Browse files

Showing the changes to libavformat (4 of 26 files). Show all

Unified · Split

4 files
  1. libavformat/hls.c +2 −2
  2. libavformat/id3v2.c +1 −1
  3. libavformat/id3v2.h +1 −1
  4. libavformat/mxfdec.c +1 −1
libavformat/hls.c+2−2
@@ -1498,9 +1498,9 @@ static int select_cur_seq_no(HLSContext *c, struct playlist *pls) · 1497 unmodified lines
14981498 static int save_avio_options(AVFormatContext *s)
14991499 {
15001500 HLSContext *c = s->priv_data;
1501− static const char *opts[] = {
1501+ static const char * const opts[] = {
15021502 "headers", "http_proxy", "user_agent", "user-agent", "cookies", NULL };
1503− const char **opt = opts;
1503+ const char * const * opt = opts;
15041504 uint8_t *buf;
15051505 int ret = 0;
15061506
libavformat/id3v2.c+1−1
@@ -102,7 +102,7 @@ const char ff_id3v2_3_tags[][4] = { · 101 unmodified lines
102102 { 0 },
103103 };
104104
105−const char *ff_id3v2_picture_types[21] = {
105+const char * const ff_id3v2_picture_types[21] = {
106106 "Other",
107107 "32x32 pixels 'file icon'",
108108 "Other file icon",
libavformat/id3v2.h+1−1
@@ -180,6 +180,6 @@ extern const char ff_id3v2_3_tags[][4]; · 179 unmodified lines
180180
181181 extern const CodecMime ff_id3v2_mime_tags[];
182182
183−extern const char *ff_id3v2_picture_types[21];
183+extern const char * const ff_id3v2_picture_types[21];
184184
185185 #endif /* AVFORMAT_ID3V2_H */
libavformat/mxfdec.c+1−1
@@ -1204,7 +1204,7 @@ static const MXFCodecUL mxf_data_essence_container_uls[] = { · 1203 unmodified lines
12041204 { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE },
12051205 };
12061206
1207−static const char* const mxf_data_essence_descriptor[] = {
1207+static const char * const mxf_data_essence_descriptor[] = {
12081208 "vbi_vanc_smpte_436M",
12091209 };
12101210

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t