[FFmpeg-cvslog] Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 12 22:39:27 2015 +0100| [9f8f2bcab6267be2054211dab9d5824af5517201] | committer: Michael Niedermayer

Merge commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8'

* commit 'c3bd1d60af97e8d2568dac9fcce7bdabb4ff93c8':
  formats: Check memory allocations

Conflicts:
	libavfilter/formats.c

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

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