* qatar/master:
  golomb: reduce scope of a few variables

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