[FFmpeg-cvslog] Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'
Michael Niedermayer
git at videolan.org
Fri Jul 17 21:51:05 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 17 21:42:14 2015 +0200| [948a15195c69da2ff9a4b0ac7df782ba1cc2795f] | committer: Michael Niedermayer
Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'
* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
configure: Factor out flacdsp module
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=948a15195c69da2ff9a4b0ac7df782ba1cc2795f
---
More information about the ffmpeg-cvslog
mailing list