[FFmpeg-cvslog] Merge commit '09f25533a564eab743f258d168697a11122914c4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 10 01:36:39 2014 +0100| [715ccc2bc47901e587939cf7b92667f343769b0a] | committer: Michael Niedermayer

Merge commit '09f25533a564eab743f258d168697a11122914c4'

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

Conflicts:
	libavdevice/v4l2.c

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

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