[FFmpeg-cvslog] Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'

Michael Niedermayer git at videolan.org
Fri Jul 17 22:55:36 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 17 22:45:34 2015 +0200| [115a9b5091cd1be8d370f2d7ec1821df595decc7] | committer: Michael Niedermayer

Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'

* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed':
  configure: Factor out vp8dsp module

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=115a9b5091cd1be8d370f2d7ec1821df595decc7
---





More information about the ffmpeg-cvslog mailing list