[FFmpeg-cvslog] Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 30 20:39:01 2015 +0200| [98263d751562e3b8cefa6d06eb95f0dee8a205db] | committer: Michael Niedermayer

Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'

* commit '23944d29a22a2cd602753b3705f73011c3bf0b18':
  indeo: Give Indeo4/5 shared code a more consistent name

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

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