[FFmpeg-cvslog] Merge commit '585dc1aecef0371ad6f16cb3750ae2a6da9cf00a'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 13:48:48 2017 -0300| [4c01fa0bc5ac5a7d9d9576cf669a1deb58e75af8] | committer: James Almer

Merge commit '585dc1aecef0371ad6f16cb3750ae2a6da9cf00a'

* commit '585dc1aecef0371ad6f16cb3750ae2a6da9cf00a':
  flvdec: Check the avio_seek return value after reading a metadata packet

This commit is a noop, see 15537c904ec96e4d2e9435100d403283a5fed029

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

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