[FFmpeg-cvslog] Merge commit 'dd53af4b37c7790ce26065b36d5655c1af38b295'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 17:40:08 2016 +0000| [a236e4e8b840b57cc3975db21a5f54cda59753a9] | committer: Derek Buitenhuis

Merge commit 'dd53af4b37c7790ce26065b36d5655c1af38b295'

This commit is a no-op. I don't want to enrange Certain People
who like to --disable-*.

* commit 'dd53af4b37c7790ce26065b36d5655c1af38b295':
  avplay: drop support for building without lavfi

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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