[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 30 12:57:58 2013 +0200| [05507348afa1c3ec53ecc1ba9061213a5154badd] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: don't return a value from a function declared void

See: 01a82f1dc544df7a4affb3858d12b7b2e492cbba

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

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