1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
|
Fix compilation with gcc 10
Patch pulled from Fedora source RPM:
https://dl.fedoraproject.org/pub/fedora/linux/development/34/Everything/source/tree/Packages/l/libmp4v2-2.1.0-0.23.trunkREV507.fc34.src.rpm
Upstream-Status: Inappropriate[no upstream]
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
diff -Nrup a/libutil/Utility.cpp b/libutil/Utility.cpp
--- a/libutil/Utility.cpp 2015-04-24 09:37:49.000000000 -0600
+++ b/libutil/Utility.cpp 2019-09-24 12:39:23.669103515 -0600
@@ -531,26 +531,26 @@ Utility::process_impl()
printHelp( false, false );
return SUCCESS;
- case LC_DEBUG:
+ case int(LC_DEBUG):
debugUpdate( std::strtoul( prog::optarg, NULL, 0 ) );
break;
- case LC_VERBOSE:
+ case int(LC_VERBOSE):
{
const uint32_t level = std::strtoul( prog::optarg, NULL, 0 );
_verbosity = ( level < 4 ) ? level : 3;
break;
}
- case LC_HELP:
+ case int(LC_HELP):
printHelp( true, false );
return SUCCESS;
- case LC_VERSION:
+ case int(LC_VERSION):
printVersion( false );
return SUCCESS;
- case LC_VERSIONX:
+ case int(LC_VERSIONX):
printVersion( true );
return SUCCESS;
diff -Nrup a/util/mp4art.cpp b/util/mp4art.cpp
--- a/util/mp4art.cpp 2015-04-24 09:37:49.000000000 -0600
+++ b/util/mp4art.cpp 2019-09-24 12:32:35.078171912 -0600
@@ -377,11 +377,11 @@ ArtUtility::utility_option( int code, bo
handled = true;
switch( code ) {
- case LC_ART_ANY:
+ case int(LC_ART_ANY):
_artFilter = numeric_limits<uint32_t>::max();
break;
- case LC_ART_INDEX:
+ case int(LC_ART_INDEX):
{
istringstream iss( prog::optarg );
iss >> _artFilter;
@@ -390,29 +390,29 @@ ArtUtility::utility_option( int code, bo
break;
}
- case LC_LIST:
+ case int(LC_LIST):
_action = &ArtUtility::actionList;
break;
- case LC_ADD:
+ case int(LC_ADD):
_action = &ArtUtility::actionAdd;
_artImageFile = prog::optarg;
if( _artImageFile.empty() )
return herrf( "invalid image file: empty-string\n" );
break;
- case LC_REMOVE:
+ case int(LC_REMOVE):
_action = &ArtUtility::actionRemove;
break;
- case LC_REPLACE:
+ case int(LC_REPLACE):
_action = &ArtUtility::actionReplace;
_artImageFile = prog::optarg;
if( _artImageFile.empty() )
return herrf( "invalid image file: empty-string\n" );
break;
- case LC_EXTRACT:
+ case int(LC_EXTRACT):
_action = &ArtUtility::actionExtract;
break;
diff -Nrup a/util/mp4chaps.cpp b/util/mp4chaps.cpp
--- a/util/mp4chaps.cpp 2015-04-24 09:37:49.000000000 -0600
+++ b/util/mp4chaps.cpp 2019-09-24 12:35:24.121316167 -0600
@@ -634,32 +634,32 @@ ChapterUtility::utility_option( int code
switch( code ) {
case 'A':
- case LC_CHPT_ANY:
+ case int(LC_CHPT_ANY):
_ChapterType = MP4ChapterTypeAny;
break;
case 'Q':
- case LC_CHPT_QT:
+ case int(LC_CHPT_QT):
_ChapterType = MP4ChapterTypeQt;
break;
case 'N':
- case LC_CHPT_NERO:
+ case int(LC_CHPT_NERO):
_ChapterType = MP4ChapterTypeNero;
break;
case 'C':
- case LC_CHPT_COMMON:
+ case int(LC_CHPT_COMMON):
_ChapterFormat = CHPT_FMT_COMMON;
break;
case 'l':
- case LC_CHP_LIST:
+ case int(LC_CHP_LIST):
_action = &ChapterUtility::actionList;
break;
case 'e':
- case LC_CHP_EVERY:
+ case int(LC_CHP_EVERY):
{
istringstream iss( prog::optarg );
iss >> _ChaptersEvery;
@@ -675,7 +675,7 @@ ChapterUtility::utility_option( int code
_action = &ChapterUtility::actionExport;
break;
- case LC_CHP_EXPORT:
+ case int(LC_CHP_EXPORT):
_action = &ChapterUtility::actionExport;
/* currently not supported since the chapters of n input files would be written to one chapter file
_ChapterFile = prog::optarg;
@@ -690,7 +690,7 @@ ChapterUtility::utility_option( int code
_action = &ChapterUtility::actionImport;
break;
- case LC_CHP_IMPORT:
+ case int(LC_CHP_IMPORT):
_action = &ChapterUtility::actionImport;
/* currently not supported since the chapters of n input files would be read from one chapter file
_ChapterFile = prog::optarg;
@@ -702,12 +702,12 @@ ChapterUtility::utility_option( int code
break;
case 'c':
- case LC_CHP_CONVERT:
+ case int(LC_CHP_CONVERT):
_action = &ChapterUtility::actionConvert;
break;
case 'r':
- case LC_CHP_REMOVE:
+ case int(LC_CHP_REMOVE):
_action = &ChapterUtility::actionRemove;
break;
diff -Nrup a/util/mp4file.cpp b/util/mp4file.cpp
--- a/util/mp4file.cpp 2015-04-24 09:37:49.000000000 -0600
+++ b/util/mp4file.cpp 2019-09-24 12:33:09.735996459 -0600
@@ -190,15 +190,15 @@ FileUtility::utility_option( int code, b
handled = true;
switch( code ) {
- case LC_LIST:
+ case int(LC_LIST):
_action = &FileUtility::actionList;
break;
- case LC_OPTIMIZE:
+ case int(LC_OPTIMIZE):
_action = &FileUtility::actionOptimize;
break;
- case LC_DUMP:
+ case int(LC_DUMP):
_action = &FileUtility::actionDump;
break;
diff -Nrup a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp
--- a/util/mp4subtitle.cpp 2015-04-24 09:37:49.000000000 -0600
+++ b/util/mp4subtitle.cpp 2019-09-24 12:33:53.739773682 -0600
@@ -165,25 +165,25 @@ SubtitleUtility::utility_option( int cod
handled = true;
switch( code ) {
- case LC_LIST:
+ case int(LC_LIST):
_action = &SubtitleUtility::actionList;
break;
- case LC_EXPORT:
+ case int(LC_EXPORT):
_action = &SubtitleUtility::actionExport;
_stTextFile = prog::optarg;
if( _stTextFile.empty() )
return herrf( "invalid TXT file: empty-string\n" );
break;
- case LC_IMPORT:
+ case int(LC_IMPORT):
_action = &SubtitleUtility::actionImport;
_stTextFile = prog::optarg;
if( _stTextFile.empty() )
return herrf( "invalid TXT file: empty-string\n" );
break;
- case LC_REMOVE:
+ case int(LC_REMOVE):
_action = &SubtitleUtility::actionRemove;
break;
diff -Nrup a/util/mp4track.cpp b/util/mp4track.cpp
--- a/util/mp4track.cpp 2015-04-24 09:37:49.000000000 -0600
+++ b/util/mp4track.cpp 2019-09-24 12:37:02.934815918 -0600
@@ -789,11 +789,11 @@ TrackUtility::utility_option( int code,
handled = true;
switch( code ) {
- case LC_TRACK_WILDCARD:
+ case int(LC_TRACK_WILDCARD):
_trackMode = TM_WILDCARD;
break;
- case LC_TRACK_INDEX:
+ case int(LC_TRACK_INDEX):
{
_trackMode = TM_INDEX;
istringstream iss( prog::optarg );
@@ -803,7 +803,7 @@ TrackUtility::utility_option( int code,
break;
}
- case LC_TRACK_ID:
+ case int(LC_TRACK_ID):
{
_trackMode = TM_ID;
istringstream iss( prog::optarg );
@@ -813,142 +813,142 @@ TrackUtility::utility_option( int code,
break;
}
- case LC_LIST:
+ case int(LC_LIST):
_action = &TrackUtility::actionList;
break;
- case LC_COLR_PARMS:
+ case int(LC_COLR_PARMS):
_colorParameterItem.convertFromCSV( prog::optarg );
break;
- case LC_COLR_PARM_HD:
+ case int(LC_COLR_PARM_HD):
_colorParameterItem.primariesIndex = 1;
_colorParameterItem.transferFunctionIndex = 1;
_colorParameterItem.matrixIndex = 1;
break;
- case LC_COLR_PARM_SD:
+ case int(LC_COLR_PARM_SD):
_colorParameterItem.primariesIndex = 6;
_colorParameterItem.transferFunctionIndex = 1;
_colorParameterItem.matrixIndex = 6;
break;
- case LC_COLR_LIST:
+ case int(LC_COLR_LIST):
_action = &TrackUtility::actionColorParameterList;
break;
- case LC_ENABLED:
+ case int(LC_ENABLED):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setEnabled;
_actionTrackModifierSet_name = "enabled";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_INMOVIE:
+ case int(LC_INMOVIE):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setInMovie;
_actionTrackModifierSet_name = "inMovie";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_INPREVIEW:
+ case int(LC_INPREVIEW):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setInPreview;
_actionTrackModifierSet_name = "inPreview";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_LAYER:
+ case int(LC_LAYER):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setLayer;
_actionTrackModifierSet_name = "layer";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_ALTGROUP:
+ case int(LC_ALTGROUP):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setAlternateGroup;
_actionTrackModifierSet_name = "alternateGroup";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_VOLUME:
+ case int(LC_VOLUME):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setVolume;
_actionTrackModifierSet_name = "volume";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_WIDTH:
+ case int(LC_WIDTH):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setWidth;
_actionTrackModifierSet_name = "width";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_HEIGHT:
+ case int(LC_HEIGHT):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setHeight;
_actionTrackModifierSet_name = "height";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_LANGUAGE:
+ case int(LC_LANGUAGE):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setLanguage;
_actionTrackModifierSet_name = "language";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_HDLRNAME:
+ case int(LC_HDLRNAME):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setHandlerName;
_actionTrackModifierSet_name = "handlerName";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_UDTANAME:
+ case int(LC_UDTANAME):
_action = &TrackUtility::actionTrackModifierSet;
_actionTrackModifierSet_function = &TrackModifier::setUserDataName;
_actionTrackModifierSet_name = "userDataName";
_actionTrackModifierSet_value = prog::optarg;
break;
- case LC_UDTANAME_R:
+ case int(LC_UDTANAME_R):
_action = &TrackUtility::actionTrackModifierRemove;
_actionTrackModifierRemove_function = &TrackModifier::removeUserDataName;
_actionTrackModifierRemove_name = "userDataName";
break;
- case LC_COLR_ADD:
+ case int(LC_COLR_ADD):
_action = &TrackUtility::actionColorParameterAdd;
break;
- case LC_COLR_SET:
+ case int(LC_COLR_SET):
_action = &TrackUtility::actionColorParameterSet;
break;
- case LC_COLR_REMOVE:
+ case int(LC_COLR_REMOVE):
_action = &TrackUtility::actionColorParameterRemove;
break;
- case LC_PASP_PARMS:
+ case int(LC_PASP_PARMS):
_pictureAspectRatioItem.convertFromCSV( prog::optarg );
break;
- case LC_PASP_LIST:
+ case int(LC_PASP_LIST):
_action = &TrackUtility::actionPictureAspectRatioList;
break;
- case LC_PASP_ADD:
+ case int(LC_PASP_ADD):
_action = &TrackUtility::actionPictureAspectRatioAdd;
break;
- case LC_PASP_SET:
+ case int(LC_PASP_SET):
_action = &TrackUtility::actionPictureAspectRatioSet;
break;
- case LC_PASP_REMOVE:
+ case int(LC_PASP_REMOVE):
_action = &TrackUtility::actionPictureAspectRatioRemove;
break;
|
