eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2014-04-19 18:20:17 +02:00
parent 010732b73a 58400ac133
commit 74a8dbe1c4
33 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/unsharp.h
View File

@@ -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;