Merge commit '51f76e4e932ebdce8ccf6cf0797651d632cfc3e2' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:50:19 +0000 (00:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:50:34 +0000 (00:50 +0100)
commit39f2e53a2457ba15e963f1ac2f5a3c98ee7fa772
treea069389f3e79eb5722d93b34371dd549a948b1e6
parentadfb4661d9ab102efe831ab9e95e9c3b32461b81
parent51f76e4e932ebdce8ccf6cf0797651d632cfc3e2
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@gmx.at>
libavdevice/oss_audio.c