Browse code

Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

* commit 'bf704132a51f5d838365158331d4e535e1df4c8e':
Don't anonymously typedef structs

Conflicts:
avprobe.c
libavutil/parseutils.c

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

Michael Niedermayer authored on 2015/02/15 05:27:26
Showing 3 changed files
... ...
@@ -86,7 +86,7 @@ static char *print_format;
86 86
 static char *stream_specifier;
87 87
 static char *show_data_hash;
88 88
 
89
-typedef struct {
89
+typedef struct ReadInterval {
90 90
     int id;             ///< identifier
91 91
     int64_t start, end; ///< start, end in second/AV_TIME_BASE units
92 92
     int has_start, has_end;
... ...
@@ -1192,7 +1192,7 @@ static const Writer flat_writer = {
1192 1192
 
1193 1193
 /* INI format output */
1194 1194
 
1195
-typedef struct {
1195
+typedef struct INIContext {
1196 1196
     const AVClass *class;
1197 1197
     int hierarchical;
1198 1198
 } INIContext;
... ...
@@ -1296,7 +1296,7 @@ static const Writer ini_writer = {
1296 1296
 
1297 1297
 /* JSON output */
1298 1298
 
1299
-typedef struct {
1299
+typedef struct JSONContext {
1300 1300
     const AVClass *class;
1301 1301
     int indent_level;
1302 1302
     int compact;
... ...
@@ -1458,7 +1458,7 @@ static const Writer json_writer = {
1458 1458
 
1459 1459
 /* XML output */
1460 1460
 
1461
-typedef struct {
1461
+typedef struct XMLContext {
1462 1462
     const AVClass *class;
1463 1463
     int within_tag;
1464 1464
     int indent_level;
... ...
@@ -35,7 +35,7 @@
35 35
 #include <windows.h>
36 36
 #endif
37 37
 
38
-typedef struct {
38
+typedef struct FileLogContext {
39 39
     const AVClass *class;
40 40
     int   log_offset;
41 41
     void *log_ctx;
... ...
@@ -62,12 +62,12 @@ int av_parse_ratio(AVRational *q, const char *str, int max,
62 62
     return 0;
63 63
 }
64 64
 
65
-typedef struct {
65
+typedef struct VideoSizeAbbr {
66 66
     const char *abbr;
67 67
     int width, height;
68 68
 } VideoSizeAbbr;
69 69
 
70
-typedef struct {
70
+typedef struct VideoRateAbbr {
71 71
     const char *abbr;
72 72
     AVRational rate;
73 73
 } VideoRateAbbr;
... ...
@@ -186,7 +186,7 @@ int av_parse_video_rate(AVRational *rate, const char *arg)
186 186
     return 0;
187 187
 }
188 188
 
189
-typedef struct {
189
+typedef struct ColorEntry {
190 190
     const char *name;            ///< a string representing the name of the color
191 191
     uint8_t     rgb_color[3];    ///< RGB values for the color
192 192
 } ColorEntry;