virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

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

Conflicts:
	avprobe.c
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-14 21:27:26 +01:00
commit 6998400c61
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffprobe.c
View File

@ -86,7 +86,7 @@ static char *print_format;
static char *stream_specifier; static char *stream_specifier;
static char *show_data_hash; static char *show_data_hash;
typedef struct { typedef struct ReadInterval {
int id; ///< identifier int id; ///< identifier
int64_t start, end; ///< start, end in second/AV_TIME_BASE units int64_t start, end; ///< start, end in second/AV_TIME_BASE units
int has_start, has_end; int has_start, has_end;
@ -1192,7 +1192,7 @@ static const Writer flat_writer = {
/* INI format output */ /* INI format output */
typedef struct { typedef struct INIContext {
const AVClass *class; const AVClass *class;
int hierarchical; int hierarchical;
} INIContext; } INIContext;
@ -1296,7 +1296,7 @@ static const Writer ini_writer = {
/* JSON output */ /* JSON output */
typedef struct { typedef struct JSONContext {
const AVClass *class; const AVClass *class;
int indent_level; int indent_level;
int compact; int compact;
@ -1458,7 +1458,7 @@ static const Writer json_writer = {
/* XML output */ /* XML output */
typedef struct { typedef struct XMLContext {
const AVClass *class; const AVClass *class;
int within_tag; int within_tag;
int indent_level; int indent_level;

2
libavutil/file.c
View File

@ -35,7 +35,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
typedef struct { typedef struct FileLogContext {
const AVClass *class; const AVClass *class;
int log_offset; int log_offset;
void *log_ctx; void *log_ctx;

6
libavutil/parseutils.c
View File

@ -62,12 +62,12 @@ int av_parse_ratio(AVRational *q, const char *str, int max,
return 0; return 0;
} }
typedef struct { typedef struct VideoSizeAbbr {
const char *abbr; const char *abbr;
int width, height; int width, height;
} VideoSizeAbbr; } VideoSizeAbbr;
typedef struct { typedef struct VideoRateAbbr {
const char *abbr; const char *abbr;
AVRational rate; AVRational rate;
} VideoRateAbbr; } VideoRateAbbr;
@ -186,7 +186,7 @@ int av_parse_video_rate(AVRational *rate, const char *arg)
return 0; return 0;
} }
typedef struct { typedef struct ColorEntry {
const char *name; ///< a string representing the name of the color const char *name; ///< a string representing the name of the color
uint8_t rgb_color[3]; ///< RGB values for the color uint8_t rgb_color[3]; ///< RGB values for the color
} ColorEntry; } ColorEntry;