[FFmpeg-cvslog] Merge commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 00:50:19 2015 +0100| [39f2e53a2457ba15e963f1ac2f5a3c98ee7fa772] | committer: Michael Niedermayer

Merge commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2' into release/2.4

* commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2':
  oss_audio: use a macro to simplify ioctl() error checking

Conflicts:
	libavdevice/oss_audio.c

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

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