Commit Graph

3 Commits

Author SHA1 Message Date
Michael Niedermayer 74a8dbe1c4 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>
2014-04-19 18:20:17 +02:00
João Bernardo 447d71b892 avfilter/vf_elbg: Fixed seed range of elbg filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-17 21:17:43 +01:00
Stefano Sabatini 8cd3685a3f lavfi: add elbg filter 2013-11-13 11:21:57 +01:00