[FFmpeg-cvslog] Merge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Thu Jun 23 12:16:42 2016 +0200| [28dac0dc061fa85fe671f43e78059fbc9f1eccac] | committer: Clément Bœsch

Merge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'

* commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7':
  fate: Update fate-lavf-ts after commit 393596f9d5

This commit is a noop, see c0ff42bf6468c7440568ec15c81edc52289f0c8a

Merged-by: Clément Bœsch <clement at stupeflix.com>

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