[FFmpeg-cvslog] Merge commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Oct  5 11:17:24 2015 +0200| [a7322bd97f2e6cf1b40e98d0408f77769fb87349] | committer: Hendrik Leppkes

Merge commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915'

* commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915':
  avutil/avstring: Inline some tiny functions

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

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