Merge commit 'cdc9ce098e8d101b43b8f68dd35ba7226f4a728c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 15:02:42 +0000 (16:02 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 1 Jan 2016 15:02:42 +0000 (16:02 +0100)
commit5f2d12b82494220f2fa65bd3295617e09ef25cad
treee41b7df211f029fa16c8e6f60f36c3ba4f6d1fa5
parentf6728a3ea27ba9b36972497676301da5999d53ac
parentcdc9ce098e8d101b43b8f68dd35ba7226f4a728c
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@gmail.com>