ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Sun Jan
18 00:06:38 2015 +0100| [85d05fdc80005c7583d5983e55eab72dc1cf63c7] | committer:
Michael Niedermayer
Merge commit '4baee1124b905cbd75240530e081c8ffa68fddbe' into release/2.4
* commit '4baee1124b905cbd75240530e081c8ffa68fddbe':
mp3: Tweak the probe scores
Conflicts:
libavformat/mp3dec.c
See: ef79bbeddd432deaf3e8316da7e5a075816108b4
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85d05fdc80005c7583d5983e55eab72dc1cf63c7
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
