[FFmpeg-cvslog] Merge commit '58e65e44f435243dc72dfce1f8af8afcf1319f34'

Michael Niedermayer git at videolan.org
Fri Jul 25 13:17:42 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 25 13:11:23 2014 +0200| [859413b66daf68402e73e6afa8f888581998f7ed] | committer: Michael Niedermayer

Merge commit '58e65e44f435243dc72dfce1f8af8afcf1319f34'

* commit '58e65e44f435243dc72dfce1f8af8afcf1319f34':
  vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c

Conflicts:
	libavcodec/vc1dsp.c

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

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





More information about the ffmpeg-cvslog mailing list