Merge commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436'
authorJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 19:46:11 +0000 (16:46 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 26 Oct 2017 19:46:11 +0000 (16:46 -0300)
commit99ba85a0e24bad519a633a1a113d838897bee0b1
tree12f015578043954e3f85f4d0588dad886ef20ef1
parentce9e07e6b67517cfa7603f97702c1645335c0634
parentf5950b8fd61ec85e0ad8790bea56b37ceea19436
Merge commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436'

* commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436':
  lavfi: Drop unused and empty header file

Merged-by: James Almer <jamrial@gmail.com>
doc/examples/filtering_audio.c
doc/examples/filtering_video.c
doc/examples/transcoding.c
libavdevice/lavfi.c
libavfilter/Makefile