[FFmpeg-cvslog] Merge commit '163a729725c6eb0081b0af41a7279f7d19aee86e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 12:18:41 2013 +0200| [165e42b5428fd0b1dbf0039e5b8555e5cce08aa9] | committer: Michael Niedermayer

Merge commit '163a729725c6eb0081b0af41a7279f7d19aee86e'

* commit '163a729725c6eb0081b0af41a7279f7d19aee86e':
  electronicarts: Let functions always returning the same value return void

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

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