diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 20:20:17 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 20:20:17 +0400 |
commit | 74a8dbe1c405e041a16c44050d9dfc92aca90d33 (patch) | |
tree | 49fa40ab5ebb4dc10ac88c1f11bc84337aaa2c11 /libavfilter/vf_boxblur.c | |
parent | 010732b73a0869d222cb281431a9a4aae89355e6 (diff) | |
parent | 58400ac133bcfb6bf8196b4e5208bc178307739b (diff) |
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/vf_boxblur.c')
-rw-r--r-- | libavfilter/vf_boxblur.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c index 3183f435fc..1fa5135d98 100644 --- a/libavfilter/vf_boxblur.c +++ b/libavfilter/vf_boxblur.c @@ -55,13 +55,13 @@ enum var_name { VARS_NB }; -typedef struct { +typedef struct FilterParam { int radius; int power; char *radius_expr; } FilterParam; -typedef struct { +typedef struct BoxBlurContext { const AVClass *class; FilterParam luma_param; FilterParam chroma_param; |