[FFmpeg-cvslog] Merge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 27 23:08:50 2014 +0100| [5ee6527c4386c76a0aae1b07842d6676ee1e91d1] | committer: Michael Niedermayer

Merge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'

* commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600':
  bethsoftvid: check return value and clean memory

Conflicts:
	libavformat/bethsoftvid.c

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

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