[FFmpeg-cvslog] Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'

Michael Niedermayer git at videolan.org
Mon Jul 7 15:14:11 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  7 15:04:05 2014 +0200| [462c6cdb8ed256d2063815b67ca4d14e62e25802] | committer: Michael Niedermayer

Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'

* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94':
  dsputil: Split off *_8x8basis to a separate context

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc_mmx.c

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

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





More information about the ffmpeg-cvslog mailing list