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/vf_libopencv.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/vf_libopencv.c')
-rw-r--r-- | libavfilter/vf_libopencv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index 2306b09bdb..6b4a7fcb38 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -68,7 +68,7 @@ static int query_formats(AVFilterContext *ctx) return 0; } -typedef struct { +typedef struct OCVContext { const AVClass *class; char *name; char *params; @@ -78,7 +78,7 @@ typedef struct { void *priv; } OCVContext; -typedef struct { +typedef struct SmoothContext { int type; int param1, param2; double param3, param4; @@ -245,7 +245,7 @@ static int parse_iplconvkernel(IplConvKernel **kernel, char *buf, void *log_ctx) return 0; } -typedef struct { +typedef struct DilateContext { int nb_iterations; IplConvKernel *kernel; } DilateContext; @@ -302,7 +302,7 @@ static void erode_end_frame_filter(AVFilterContext *ctx, IplImage *inimg, IplIma cvErode(inimg, outimg, dilate->kernel, dilate->nb_iterations); } -typedef struct { +typedef struct OCVFilterEntry { const char *name; size_t priv_size; int (*init)(AVFilterContext *ctx, const char *args); |