[FFmpeg-cvslog] Merge commit '353240541d4ec317471b5cbcaa3e027d00ff8f5c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 14 01:27:51 2014 +0200| [af5ec182252d869c62e327b3b2ffe3dc043fabbd] | committer: Michael Niedermayer

Merge commit '353240541d4ec317471b5cbcaa3e027d00ff8f5c'

* commit '353240541d4ec317471b5cbcaa3e027d00ff8f5c':
  cpu-test: Add unistd.h #include for getopt()

No change as we already have a #include <unistd.h>

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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