[FFmpeg-cvslog] Merge commit 'cdc9ce098e8d101b43b8f68dd35ba7226f4a728c'

[Hendrik Leppkes]

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

Merge commit 'cdc9ce098e8d101b43b8f68dd35ba7226f4a728c'

* commit 'cdc9ce098e8d101b43b8f68dd35ba7226f4a728c':
  lavc: print the name of the codec, not its implementation, in avcodec_string

FFmpeg has already done this.

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

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