* commit '4d7aeff9':
  flvenc: Don't pretend to support muxing "plain" VP6

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