* commit 'e767c9e8':
  flv: Validate and reject unsupported codecs

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