[FFmpeg-cvslog] Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 13:47:12 2015 +0100| [c5eb725fd33ee705c3c7d674ae65bbb717bf7207] | committer: Michael Niedermayer

Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'

* commit '8a9641a652ed1546fedfda22584f79d3d423096e':
  bsf: check memory allocations

Conflicts:
	libavcodec/noise_bsf.c

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

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