* commit 'f771b3ab':
  avidec: do not export stream_codec_tag

Conflicts:
	libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>