[FFmpeg-cvslog] Merge commit '00b62968d079e63bf22028f253ac297292436ebe'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Nov  2 11:43:50 2015 +0100| [6b5d6c93dda9be232507a188f83e1f639238e958] | committer: Hendrik Leppkes

Merge commit '00b62968d079e63bf22028f253ac297292436ebe'

* commit '00b62968d079e63bf22028f253ac297292436ebe':
  os_support: Don't try to return the service name as a string in getnameinfo

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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