diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 22:38:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 22:38:51 +0200 |
| commit | a8d01a73789260533778371e38e733d047316d83 (patch) | |
| tree | 8feb3e26813848ac20bbad3c6c99a6c9e4b5f37a /libavutil/crc.h | |
| parent | 39edcadc07e90c551596e74a932b603eea0c8b01 (diff) | |
| parent | 0983d48111f578e17e8c1967d25ce593fce62b63 (diff) | |
| download | ffmpeg-a8d01a73789260533778371e38e733d047316d83.tar.gz | |
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>
Diffstat (limited to 'libavutil/crc.h')
| -rw-r--r-- | libavutil/crc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/crc.h b/libavutil/crc.h index f4219ca5bb..e86bf1deba 100644 --- a/libavutil/crc.h +++ b/libavutil/crc.h @@ -39,6 +39,7 @@ typedef enum { AV_CRC_16_CCITT, AV_CRC_32_IEEE, AV_CRC_32_IEEE_LE, /*< reversed bitorder version of AV_CRC_32_IEEE */ + AV_CRC_16_ANSI_LE, /*< reversed bitorder version of AV_CRC_16_ANSI */ AV_CRC_24_IEEE = 12, AV_CRC_MAX, /*< Not part of public API! Do not use outside libavutil. */ }AVCRCId; |