[FFmpeg-cvslog] Merge commit '8a0bc40545a216a49f43db5d9a42a63961333354'
Michael Niedermayer
git at videolan.org
Sun Mar 9 22:26:48 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 9 22:25:17 2014 +0100| [858d9947e4fe1b89d3f75a2a7d9fca7e5a496062] | committer: Michael Niedermayer
Merge commit '8a0bc40545a216a49f43db5d9a42a63961333354'
* commit '8a0bc40545a216a49f43db5d9a42a63961333354':
libspeex: support ZygoAudio (quality 10 mode)
Conflicts:
libavformat/isom.c
See: e26b066cd8db361feba90e943c6cfdf062c52272
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=858d9947e4fe1b89d3f75a2a7d9fca7e5a496062
---
More information about the ffmpeg-cvslog
mailing list