[FFmpeg-cvslog] Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'
Michael Niedermayer
git at videolan.org
Fri Jul 17 23:12:23 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 17 23:04:47 2015 +0200| [c7c33ab721cfafbbe269c8f1505eb2d9a80d7af4] | committer: Michael Niedermayer
Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'
* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09':
configure: Factor out g722dsp module
Conflicts:
configure
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7c33ab721cfafbbe269c8f1505eb2d9a80d7af4
---
More information about the ffmpeg-cvslog
mailing list