[FFmpeg-cvslog] Merge commit '99143140dea12363af680d02e23cb42cfe191679'
Michael Niedermayer
git at videolan.org
Fri Oct 24 12:58:10 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 24 12:49:53 2014 +0200| [899d3706d8fde29b78d0a72f92cfcd8be6aab419] | committer: Michael Niedermayer
Merge commit '99143140dea12363af680d02e23cb42cfe191679'
* commit '99143140dea12363af680d02e23cb42cfe191679':
mp3dec: fix reading the Xing tag
Conflicts:
libavformat/mp3dec.c
See: 19ff479f694ddccc1fd1fa00eff94f96ca82671b
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=899d3706d8fde29b78d0a72f92cfcd8be6aab419
---
More information about the ffmpeg-cvslog
mailing list