[FFmpeg-cvslog] Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'

Michael Niedermayer git at videolan.org
Thu Apr 17 22:47:26 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 17 22:38:51 2014 +0200| [a8d01a73789260533778371e38e733d047316d83] | committer: Michael Niedermayer

Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'

* commit '0983d48111f578e17e8c1967d25ce593fce62b63':
  crc: add ANSI CRC16 LE

Conflicts:
	doc/APIchanges
	libavutil/crc.c
	libavutil/crc.h
	libavutil/version.h
	tests/ref/fate/crc

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

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





More information about the ffmpeg-cvslog mailing list