* commit 'f80b60ad':
  bitstream: forward error values and drop few abort()

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