[FFmpeg-cvslog] Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  2 21:45:58 2014 +0200| [50c6bffb67d140bcf4b28d0b4495648b9f6b07f9] | committer: Michael Niedermayer

Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'

* commit '74512f7e369da40e1148c92b58cd8e59f7737b8f':
  8svx: Return proper error codes

Conflicts:
	libavcodec/8svx.c

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

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