[FFmpeg-cvslog] Merge commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct  2 16:00:14 2017 -0300| [0451c3db4ee21afb437279b656c83269677801e5] | committer: James Almer

Merge commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8'

* commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8':
  mkv: Update the seek test to match 5d3953a5dc
  fate: Update fate-lavf-mkv after commit 5d3953a5dc

This commit is a noop.

Merged-by: James Almer <jamrial at gmail.com>

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