Merge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 22:08:50 +0000 (23:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 22:19:08 +0000 (23:19 +0100)
commit5ee6527c4386c76a0aae1b07842d6676ee1e91d1
tree36ca8ac6d88960851cd8f00979eb3f431bfa5c91
parent9612dcd6b24f21b28940ef95f31335ab436b255d
parente6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600
Merge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'

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

Conflicts:
libavformat/bethsoftvid.c

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