[FFmpeg-cvslog] Merge commit '1da2a20763ae9ca579d5fd20763065871ddf6311'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Oct  5 11:24:10 2015 +0200| [fbd71bba8583eca54b481737ff04a4ff7e0a9fc2] | committer: Hendrik Leppkes

Merge commit '1da2a20763ae9ca579d5fd20763065871ddf6311'

* commit '1da2a20763ae9ca579d5fd20763065871ddf6311':
  dvbsubdec: Fix function return type

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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