Changeset ef79bbed in ffmpeg

Timestamp:

Dec 8, 2014, 1:18:28 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

208c03a4

Parents:

dce10f81 (diff), 4fd7e63c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (12/08/14 01:03:30)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/08/14 01:18:28)

Message:

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>

(No files)