Merge commit '4fd7e63c87226584e60200b82630a6057c0a6663'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2014-12-08 02:03:30 +01:00

parent dce10f8178 4fd7e63c87

commit ef79bbeddd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available