Merge commit 'f273f7fb25b68792be481c9241b0ec2876e41f35'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:08:45 +0000 (18:08 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:08:45 +0000 (18:08 +0000)
commitdc61014319bacd28b1a6c15976e72356b0870e97
treea37a6fceeffe017406a250af560c92024ab87938
parent79127dbbeffa87243c92af2befc09ad63bcbd1a1
parentf273f7fb25b68792be481c9241b0ec2876e41f35
Merge commit 'f273f7fb25b68792be481c9241b0ec2876e41f35'

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

* commit 'f273f7fb25b68792be481c9241b0ec2876e41f35':
  mkv: Force the full parsing of mp3

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