* commit '55c4cba2':
  huffyuvenc: BGRA support

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