Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:06:40 +0000 (18:06 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:06:40 +0000 (18:06 +0000)
commit79127dbbeffa87243c92af2befc09ad63bcbd1a1
treea37a6fceeffe017406a250af560c92024ab87938
parent9fad1ce7c95adeec440f51af77f730340a6d27b8
parent3ef98937f512184f80d3bd30015f5ec83dc11eb0
Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'

* commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0':
  mov: Force the full parsing of mp3

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/mov.c