diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 18:20:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 18:20:17 +0200 |
| commit | 74a8dbe1c405e041a16c44050d9dfc92aca90d33 (patch) | |
| tree | 49fa40ab5ebb4dc10ac88c1f11bc84337aaa2c11 /libavfilter/vsrc_testsrc.c | |
| parent | 010732b73a0869d222cb281431a9a4aae89355e6 (diff) | |
| parent | 58400ac133bcfb6bf8196b4e5208bc178307739b (diff) | |
| download | ffmpeg-74a8dbe1c405e041a16c44050d9dfc92aca90d33.tar.gz | |
Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
lavfi: name anonymous structs
Conflicts:
libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsrc_testsrc.c')
| -rw-r--r-- | libavfilter/vsrc_testsrc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 0ad1474193..8814440760 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -47,7 +47,7 @@ #include "internal.h" #include "video.h" -typedef struct { +typedef struct TestSourceContext { const AVClass *class; int w, h; unsigned int nb_frame; @@ -488,7 +488,7 @@ static void draw_digit(int digit, uint8_t *dst, int dst_linesize, #define LEFT_BOT_VBAR 16 #define RIGHT_TOP_VBAR 32 #define RIGHT_BOT_VBAR 64 - struct { + struct segments { int x, y, w, h; } segments[] = { { 1, 0, 5, 1 }, /* TOP_HBAR */ |