Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 16:00:27 +0000 (18:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 16:03:55 +0000 (18:03 +0200)
commitd1c359777f3ebccb7565043cd79347ab305758d8
tree2b128fe5b09fbda7ffb17084c952e71fa81044ce
parentb917d7024e3613155b3c6428ad9049156d55286d
parente7fc9796d82abc99ef0af71027fb9aaa5311d137
Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'

* commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137':
  lavc: do not use AVCodecContext.codec_name in avcodec_string()

Conflicts:
libavcodec/utils.c

See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>