Merge commit 'e6c66f1e'

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

Conflicts:
	libavformat/bethsoftvid.c

See: 3632f35cMerged-by: Michael Niedermayer <michaelni@gmx.at>