[FFmpeg-cvslog] Merge commit '84bf64d3598c98a748e609195358ea04b0cfd140'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 29 22:21:49 2014 +0100| [a8605be30fddc48ac043a4bd56841bc1f004a9c5] | committer: Michael Niedermayer

Merge commit '84bf64d3598c98a748e609195358ea04b0cfd140'

* commit '84bf64d3598c98a748e609195358ea04b0cfd140':
  bethsoftvid: simplify return handling

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

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