* commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e': huffyuvenc: BGRA support Conflicts: libavcodec/huffyuvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>