* commit '570a4a01':
  avidec: use sensible error codes instead of -1

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