diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 23:51:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-18 00:38:07 +0200 |
| commit | cdc166acd80bf7de7338ac95b3f283dd531a9a06 (patch) | |
| tree | d818820e0e2fb920e510ac6a92ff4f46a248468e /libavformat/aviobuf.c | |
| parent | a8d01a73789260533778371e38e733d047316d83 (diff) | |
| parent | 32d05934abc7427bb90380a4c1ab20a15fd7d821 (diff) | |
Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'
* commit '32d05934abc7427bb90380a4c1ab20a15fd7d821':
mp3dec: decode more data from Info header
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index be4dd7acea..32a1f92cb8 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -469,6 +469,12 @@ unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, return av_crc(av_crc_get_table(AV_CRC_32_IEEE), checksum, buf, len); } +unsigned long ff_crcA001_update(unsigned long checksum, const uint8_t *buf, + unsigned int len) +{ + return av_crc(av_crc_get_table(AV_CRC_16_ANSI_LE), checksum, buf, len); +} + unsigned long ffio_get_checksum(AVIOContext *s) { s->checksum = s->update_checksum(s->checksum, s->checksum_ptr, |