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 /doc | |
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 'doc')
-rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 4cf922b6e3..453707cbad 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2014-04-xx - xxxxxxx - lavu 53.12.0 / 52.77.100 - crc.h + Add AV_CRC_16_ANSI_LE crc variant. + 2014-04-XX - xxxxxxx - lavf xx.xx.1xx - avformat.h Add av_format_inject_global_side_data() |