[FFmpeg-cvslog] Merge commit '4a2a4524a3f50ed302820ba971ddd48e78c7436f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 21 14:54:16 2012 +0200| [99ea47fe5a554126c2ddaccac42979e49d891aa4] | committer: Michael Niedermayer

Merge commit '4a2a4524a3f50ed302820ba971ddd48e78c7436f'

* commit '4a2a4524a3f50ed302820ba971ddd48e78c7436f':
  ffv1: propagate errors

Conflicts:
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c

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

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