Merge commit '563e6d860391bac0511984e5c0842320b5c94d2d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:18:05 +0000 (18:18 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:18:05 +0000 (18:18 +0100)
commit42a088784b94847cd04802b36866cb9a8d196151
treed60d5ae253868ecb79dd12972a0d0552d92ac7b9
parent0e29820cd16461414236068992d9d35fa0ca058f
parent563e6d860391bac0511984e5c0842320b5c94d2d
Merge commit '563e6d860391bac0511984e5c0842320b5c94d2d'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/segafilm.c