[FFmpeg-cvslog] Merge commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 10 01:17:38 2014 +0100| [d99653c9e444323841030b41e66accd5b36945e7] | committer: Michael Niedermayer

Merge commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'

* commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478':
  v4l2: Use av_strerror

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=d99653c9e444323841030b41e66accd5b36945e7
---