Merge commit '4fd7e63c87226584e60200b82630a6057c0a6663'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 01:03:30 +0000 (02:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 01:18:28 +0000 (02:18 +0100)
commitef79bbeddd432deaf3e8316da7e5a075816108b4
tree9da5be2285c231ec6b3162fa8afb5336aa86440f
parentdce10f8178343d3c8b849f2470028e190a42a27c
parent4fd7e63c87226584e60200b82630a6057c0a6663
Merge commit '4fd7e63c87226584e60200b82630a6057c0a6663'

* commit '4fd7e63c87226584e60200b82630a6057c0a6663':
  mp3: Tweak the probe scores

Conflicts:
libavformat/mp3dec.c

FFmpeg detects the file fine, and there is a non zero risk
that this change may lead to misdetections, thus not merged.
If someone has a mp3 file that is misdetected, please open a ticket

Merged-by: Michael Niedermayer <michaelni@gmx.at>