[FFmpeg-cvslog] Merge commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Jan  1 16:16:57 2016 +0100| [5e8b05345243cdec3ca01116ce130da812ffed3d] | committer: Hendrik Leppkes

Merge commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6'

* commit '2c6811397bdf13d43ca206e48d6d6da9c2cd47c6':
  lavc: add profiles to AVCodecDescriptor

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

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