Merge commit 'ce6f780bc6656ad3895f81a988b239ad3c8af4b8'
authorJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 19:15:02 +0000 (16:15 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 19:15:02 +0000 (16:15 -0300)
commit655418014c88d5a87b3427a8f89d20cf5c86520d
tree9eedba0dcc39eb55c9fc37d453f38857a37981d9
parentb26b4d62be4e26c4ebc1f30c082b2ffbbe9bc40a
parentce6f780bc6656ad3895f81a988b239ad3c8af4b8
Merge commit 'ce6f780bc6656ad3895f81a988b239ad3c8af4b8'

* commit 'ce6f780bc6656ad3895f81a988b239ad3c8af4b8':
  configure: Add missing asyncts filter, movie filter, and output example deps

Merged-by: James Almer <jamrial@gmail.com>
libavfilter/src_movie.c