[FFmpeg-cvslog] Merge commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Jul  9 14:49:32 2016 +0200| [1ad3ffadd9102b4a752c634e401a1438eba9d416] | committer: Clément Bœsch

Merge commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42'

* commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42':
  avdevice: Ignore timefilter test program

This commit is a noop, /timefilter entry was added in the original merge
(5d48e4eafa6c4559683892b8638d10508125f3cf)

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ad3ffadd9102b4a752c634e401a1438eba9d416
---