[FFmpeg-cvslog] Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 22 13:38:20 2013 +0100| [b4a7f4d018aaeb29d18d5982e7234e472b58bac6] | committer: Michael Niedermayer

Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'

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

Conflicts:
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4a7f4d018aaeb29d18d5982e7234e472b58bac6
---