[FFmpeg-cvslog] Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'

Michael Niedermayer git at videolan.org
Fri May 30 00:12:25 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 30 00:01:45 2014 +0200| [ea0931fb962f2436695606a8ef9a4811e4970e22] | committer: Michael Niedermayer

Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'

* commit '65d5d5865845f057cc6530a8d0f34db952d9009c':
  dsputil: Move SVQ1 encoding specific bits into svq1enc

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list