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>

1 files changed, 1 insertions, 1 deletions

diff --git a/libavfilter/unsharp.h b/libavfilter/unsharp.h
index 867892085d..c2aed64a01 100644
--- a/libavfilter/unsharp.h
+++ b/libavfilter/unsharp.h
@@ -64,7 +64,7 @@ typedef struct UnsharpFilterParam {
     uint32_t *sc[MAX_MATRIX_SIZE - 1];       ///< finite state machine storage
 } UnsharpFilterParam;
 
-typedef struct {
+typedef struct UnsharpContext {
     const AVClass *class;
     int lmsize_x, lmsize_y, cmsize_x, cmsize_y;
     float lamount, camount;