[FFmpeg-cvslog] Merge commit '563e6d860391bac0511984e5c0842320b5c94d2d'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Nov 10 18:18:05 2015 +0100| [42a088784b94847cd04802b36866cb9a8d196151] | committer: Hendrik Leppkes

Merge commit '563e6d860391bac0511984e5c0842320b5c94d2d'

* commit '563e6d860391bac0511984e5c0842320b5c94d2d':
  segafilm: drop the "song and dance" for cinepak

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

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