[FFmpeg-cvslog] Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 14 02:10:43 2013 +0200| [d794b7db1453ada81c49ae03e777250b5c2868c6] | committer: Michael Niedermayer

Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'

* commit '1b20d0f581f01f2df601c9e68d0d321672d97af7':
  cavs: Return meaningful error values

Conflicts:
	libavcodec/cavsdec.c

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

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