ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Dec 8 02:03:30 2014 +0100| [ef79bbeddd432deaf3e8316da7e5a075816108b4] | committer: Michael Niedermayer
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 <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef79bbeddd432deaf3e8316da7e5a075816108b4 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog