Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 20:38:51 +0000 (22:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 20:38:51 +0000 (22:38 +0200)
commita8d01a73789260533778371e38e733d047316d83
tree8feb3e26813848ac20bbad3c6c99a6c9e4b5f37a
parent39edcadc07e90c551596e74a932b603eea0c8b01
parent0983d48111f578e17e8c1967d25ce593fce62b63
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@gmx.at>
doc/APIchanges
libavutil/crc.c
libavutil/crc.h
libavutil/version.h
tests/ref/fate/crc