[FFmpeg-cvslog] Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'

Michael Niedermayer git at videolan.org
Fri May 30 01:30:05 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 30 01:23:04 2014 +0200| [d35899ccce39e77a3f7fb667bdfc710c605d03a4] | committer: Michael Niedermayer

Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'

* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
  dsputil: Move Bink-specific add_pixels8 to binkdsp

Conflicts:
	libavcodec/dsputil.c

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

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





More information about the ffmpeg-cvslog mailing list