diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:27:26 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:27:44 +0100 |
commit | 6998400c618fb267acb6b7281418f3b89fcabc8a (patch) | |
tree | 387c05201268ebf28bf9811d55c226099347f138 /libavutil/parseutils.c | |
parent | a94eba6f0c0666de8ccbc56c62112d7e5f1132be (diff) | |
parent | bf704132a51f5d838365158331d4e535e1df4c8e (diff) | |
download | ffmpeg-streaming-6998400c618fb267acb6b7281418f3b89fcabc8a.zip ffmpeg-streaming-6998400c618fb267acb6b7281418f3b89fcabc8a.tar.gz |
Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'
* commit 'bf704132a51f5d838365158331d4e535e1df4c8e':
Don't anonymously typedef structs
Conflicts:
avprobe.c
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
-rw-r--r-- | libavutil/parseutils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 4708699..8cd844e 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -62,12 +62,12 @@ int av_parse_ratio(AVRational *q, const char *str, int max, return 0; } -typedef struct { +typedef struct VideoSizeAbbr { const char *abbr; int width, height; } VideoSizeAbbr; -typedef struct { +typedef struct VideoRateAbbr { const char *abbr; AVRational rate; } VideoRateAbbr; @@ -186,7 +186,7 @@ int av_parse_video_rate(AVRational *rate, const char *arg) return 0; } -typedef struct { +typedef struct ColorEntry { const char *name; ///< a string representing the name of the color uint8_t rgb_color[3]; ///< RGB values for the color } ColorEntry; |