[FFmpeg-cvslog] Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'

Michael Niedermayer git at videolan.org
Fri Jul 17 22:31:40 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 17 22:21:36 2015 +0200| [fd29dd432c56b524e3a10c2274935efa27220682] | committer: Michael Niedermayer

Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'

* commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418':
  configure: Factor out rv34dsp module

Conflicts:
	libavcodec/Makefile
	libavcodec/x86/Makefile

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

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





More information about the ffmpeg-cvslog mailing list