* commit 'be1e1373':
  flvenc: Support muxing VP6A as well

Conflicts:
	libavformat/flvenc.c

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