[FFmpeg-cvslog] Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'

Michael Niedermayer git at videolan.org
Thu Jun 19 05:16:55 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 19 04:41:48 2014 +0200| [2b05db4f8102148d013755ac2a7e47f6d79ff7ca] | committer: Michael Niedermayer

Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'

* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9':
  dsputil: Split clear_block*/fill_block* off into a separate context

Conflicts:
	configure
	libavcodec/asvdec.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.h
	libavcodec/eamad.c
	libavcodec/intrax8.c
	libavcodec/mjpegdec.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/vc1dec.c
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c

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

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





More information about the ffmpeg-cvslog mailing list