[FFmpeg-cvslog] Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 29 21:41:59 2014 +0100| [265c4771cc764372104ba8f6abfdde9239f4c0ad] | committer: Michael Niedermayer

Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'

* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e':
  fbdev: Use av_strerror

Conflicts:
	libavdevice/fbdev_dec.c

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

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