* commit 'a7ac1a7b':
  flv: Name an enum and use its type

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