Merge commit 'cea1eef25c3310a68dd327eb74aae14ad3c2ddef'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 15:29:28 +0000 (16:29 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 15:29:28 +0000 (16:29 +0100)
commit15c60c8af2271cd7d5c6c6ce7f8f127a32f18cfd
treed2dcafc4dc5d9305e7f45dfd11db1319f00ed90d
parente76064172098582148665df15484ae5d4e5194a9
parentcea1eef25c3310a68dd327eb74aae14ad3c2ddef
Merge commit 'cea1eef25c3310a68dd327eb74aae14ad3c2ddef'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/utils.c