[FFmpeg-cvslog] Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 04:30:25 2014 +0100| [934f2d2f5c16df8aad9f401a9fd842b5d9a78b11] | committer: Michael Niedermayer

Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'

* commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed':
  cmdutils: check file access functions return values

Conflicts:
	cmdutils.c

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

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