[FFmpeg-cvslog] Merge commit 'f128b8e19ac7f702adae899ab91cc1e80f238761'

[Hendrik Leppkes]

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

Merge commit 'f128b8e19ac7f702adae899ab91cc1e80f238761'

* commit 'f128b8e19ac7f702adae899ab91cc1e80f238761':
  mov: detect cover art pictures by content

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

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