* commit '8ef33497':
  build: Add config option for CABAC code

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