[FFmpeg-cvslog] Merge commit 'a674b31240e99a369059385b03582b35629d190f'

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Mon Feb 12 23:12:43 2018 +0000| [0018f17f233d5a702513b7f83eadff8d15f08883] | committer: Mark Thompson

Merge commit 'a674b31240e99a369059385b03582b35629d190f'

* commit 'a674b31240e99a369059385b03582b35629d190f':
  build: Ignore generated mpeg12framerate test binary

This commit is a noop, see fb791d28766bdacbb685a77c381101afc98ed58b

Merged-by: Mark Thompson <sw at jkqxz.net>

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