* qatar/master:
  h263dec: Remove a hack that can cause infinite loops

Conflicts:
	libavcodec/h263dec.c

See: d2981b8eMerged-by: Michael Niedermayer <michaelni@gmx.at>