Mercurial > libavcodec.hg
changeset 5276:0d71d658b19f libavcodec
Use proper bytestream functions
| author | vitor |
|---|---|
| date | Tue, 10 Jul 2007 17:50:44 +0000 |
| parents | 91416b4f1929 |
| children | 7b3fcb7c61ce |
| files | alac.c |
| diffstat | 1 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/alac.c Tue Jul 10 17:31:17 2007 +0000 +++ b/alac.c Tue Jul 10 17:50:44 2007 +0000 @@ -55,6 +55,7 @@ #include "avcodec.h" #include "bitstream.h" +#include "bytestream.h" #define ALAC_EXTRADATA_SIZE 36 #define MAX_CHANNELS 2 @@ -116,22 +117,22 @@ av_log(alac->avctx, AV_LOG_ERROR, "setinfo_max_samples_per_frame too large\n"); return -1; } - alac->setinfo_max_samples_per_frame = AV_RB32(ptr); /* buffer size / 2 ? */ - ptr += 4; + + /* buffer size / 2 ? */ + alac->setinfo_max_samples_per_frame = bytestream_get_be32(&ptr); alac->setinfo_7a = *ptr++; alac->setinfo_sample_size = *ptr++; alac->setinfo_rice_historymult = *ptr++; alac->setinfo_rice_initialhistory = *ptr++; alac->setinfo_rice_kmodifier = *ptr++; alac->setinfo_7f = *ptr++; // channels? - alac->setinfo_80 = AV_RB16(ptr); - ptr += 2; - alac->setinfo_82 = AV_RB32(ptr); // max coded frame size - ptr += 4; - alac->setinfo_86 = AV_RB32(ptr); // bitrate ? - ptr += 4; - alac->setinfo_8a_rate = AV_RB32(ptr); // samplerate - ptr += 4; + alac->setinfo_80 = bytestream_get_be16(&ptr); + /* max coded frame size */ + alac->setinfo_82 = bytestream_get_be32(&ptr); + /* bitrate ? */ + alac->setinfo_86 = bytestream_get_be32(&ptr); + /* samplerate */ + alac->setinfo_8a_rate = bytestream_get_be32(&ptr); allocate_buffers(alac);