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/avio_internal.h | |
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/avio_internal.h')
-rw-r--r-- | libavformat/avio_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 8441d49971..f4bc39c600 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -105,6 +105,8 @@ void ffio_init_checksum(AVIOContext *s, unsigned long ffio_get_checksum(AVIOContext *s); unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, unsigned int len); +unsigned long ff_crcA001_update(unsigned long checksum, const uint8_t *buf, + unsigned int len); /** * Open a write only packetized memory stream with a maximum packet |