
* 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>
* 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>