falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '4baee1124b905cbd75240530e081c8ffa68fddbe' into release/2.4 

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

Conflicts:
	libavformat/mp3dec.c

See: ef79bbeddd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.7
Michael Niedermayer 11 years ago
parent
c8a2b1ac3c 4baee1124b
commit
85d05fdc80
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available