[FFmpeg-cvslog] Merge commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49'

Derek Buitenhuis git at videolan.org
Wed Feb 24 19:27:43 CET 2016


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 24 18:27:00 2016 +0000| [2ef37691a0597529280dcb5be90325687eadac26] | committer: Derek Buitenhuis

Merge commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49'

This commit is a no-op. We already do this.

* commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49':
  matroska: Always consider S_TEXT/UTF8 as SRT when demuxing

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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





More information about the ffmpeg-cvslog mailing list