Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:20:17 +0000 (18:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:20:17 +0000 (18:20 +0200)
commit74a8dbe1c405e041a16c44050d9dfc92aca90d33
tree49fa40ab5ebb4dc10ac88c1f11bc84337aaa2c11
parent010732b73a0869d222cb281431a9a4aae89355e6
parent58400ac133bcfb6bf8196b4e5208bc178307739b
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>
33 files changed:
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/f_select.c
libavfilter/fifo.c
libavfilter/setpts.c
libavfilter/settb.c
libavfilter/src_movie.c
libavfilter/unsharp.h
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_elbg.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_format.c
libavfilter/vf_framestep.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.h
libavfilter/vf_interlace.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vsrc_testsrc.c