[FFmpeg-cvslog] Merge commit 'cea1eef25c3310a68dd327eb74aae14ad3c2ddef'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Jan  1 16:29:28 2016 +0100| [15c60c8af2271cd7d5c6c6ce7f8f127a32f18cfd] | committer: Hendrik Leppkes

Merge commit 'cea1eef25c3310a68dd327eb74aae14ad3c2ddef'

* commit 'cea1eef25c3310a68dd327eb74aae14ad3c2ddef':
  lavc: get the profile name through the codec descriptor in avcodec_string()

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

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