Merge commit '22e76ec6'

* commit '22e76ec6':
  atrac3: set the getbits context the right buffer_end
  atrac3: fix error handling

Conflicts:
	libavcodec/atrac3.c

No change as these issues have been fixed previously
See: c8f25caf
See: 5eaed6d3Merged-by: Michael Niedermayer <michaelni@gmx.at>