[FFmpeg-cvslog] Merge commit '92ba965103d3884609730ba9bf293772dc78a9ef'

Michael Niedermayer git at videolan.org
Wed Mar 26 15:41:15 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 15:36:27 2014 +0100| [2d15e0c01dfd36270508a37004b1ef778198dd0c] | committer: Michael Niedermayer

Merge commit '92ba965103d3884609730ba9bf293772dc78a9ef'

* commit '92ba965103d3884609730ba9bf293772dc78a9ef':
  dsputil: Move draw_edges and clear_block* out of dsputil_template

Conflicts:
	libavcodec/dsputil.c

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

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





More information about the ffmpeg-cvslog mailing list