[FFmpeg-cvslog] Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'

Michael Niedermayer git at videolan.org
Fri Jul 17 22:10:18 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 17 21:59:45 2015 +0200| [77cd5193a5a5f745769123466b13aa52481436a2] | committer: Michael Niedermayer

Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'

* commit '575ec60e542114b2ef5b2f88b28eeb72389dda45':
  configure: Factor out mss34dsp module

Conflicts:
	libavcodec/Makefile

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

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





More information about the ffmpeg-cvslog mailing list