* qatar/master:
  dcadec: add disable_xch private option.

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