Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

* commit 'bf704132a51f5d838365158331d4e535e1df4c8e': Don't anonymously typedef structs Conflicts: avprobe.c libavutil/parseutils.c Merged-by: Michael Niedermayer <[email protected]>
zhengxj91 · Feb 14, 2015 · 6998400 · 6998400
2 parents a94eba6 + bf70413
commit 6998400
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/ffprobe.c b/ffprobe.c
@@ -86,7 +86,7 @@ static char *print_format;
 static char *stream_specifier;
 static char *show_data_hash;
 
-typedef struct {
+typedef struct ReadInterval {
  int id; ///< identifier
  int64_t start, end; ///< start, end in second/AV_TIME_BASE units
  int has_start, has_end;
@@ -1192,7 +1192,7 @@ static const Writer flat_writer = {
 
 /* INI format output */
 
-typedef struct {
+typedef struct INIContext {
  const AVClass *class;
  int hierarchical;
 } INIContext;
@@ -1296,7 +1296,7 @@ static const Writer ini_writer = {
 
 /* JSON output */
 
-typedef struct {
+typedef struct JSONContext {
  const AVClass *class;
  int indent_level;
  int compact;
@@ -1458,7 +1458,7 @@ static const Writer json_writer = {
 
 /* XML output */
 
-typedef struct {
+typedef struct XMLContext {
  const AVClass *class;
  int within_tag;
  int indent_level;

diff --git a/libavutil/file.c b/libavutil/file.c
@@ -35,7 +35,7 @@
 #include <windows.h>
 #endif
 
-typedef struct {
+typedef struct FileLogContext {
  const AVClass *class;
  int log_offset;
  void *log_ctx;

diff --git 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;