[FFmpeg-cvslog] Merge commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  1 12:11:24 2017 +0200| [2738b4cee01c4dcccce3b79be9b6461830580258] | committer: Clément Bœsch

Merge commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9'

* commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9':
  avisynth: Simplify the pix_fmt check for the newer AviSynth API

This commit is a noop, see 0ed5c3ce81811dcd93f21cdd1204d4c68bca9654

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

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