[FFmpeg-cvslog] Merge commit '6f7a32839d1b913be8170e91c3ac9816b314da21'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  3 22:39:41 2015 +0100| [acfb4ede2f6b59963381c469fe002c44132f02e6] | committer: Michael Niedermayer

Merge commit '6f7a32839d1b913be8170e91c3ac9816b314da21'

* commit '6f7a32839d1b913be8170e91c3ac9816b314da21':
  svq1enc: correctly handle memory error and allocations

Conflicts:
	libavcodec/svq1enc.c

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

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