* commit 'bae557ed':
  dump: display codec tags when available

Conflicts:
	libavcodec/utils.c

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