Merge commit '09f25533a564eab743f258d168697a11122914c4'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Nov 2014 00:36:39 +0000 (01:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Nov 2014 00:37:08 +0000 (01:37 +0100)
commit715ccc2bc47901e587939cf7b92667f343769b0a
tree5923ae33ca240bc4be21a6742551881c0e7b254b
parentd99653c9e444323841030b41e66accd5b36945e7
parent09f25533a564eab743f258d168697a11122914c4
Merge commit '09f25533a564eab743f258d168697a11122914c4'

* commit '09f25533a564eab743f258d168697a11122914c4':
  v4l2: Preserve errno values

Conflicts:
libavdevice/v4l2.c

See: 60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/v4l2.c