diff options
Diffstat (limited to 'apps/codecs/libm4a/demux.c')
-rw-r--r-- | apps/codecs/libm4a/demux.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c index 29cbba7402..634bb4ffca 100644 --- a/apps/codecs/libm4a/demux.c +++ b/apps/codecs/libm4a/demux.c | |||
@@ -139,7 +139,8 @@ static bool read_chunk_esds(qtmovie_t *qtmovie, size_t chunk_len) | |||
139 | temp=stream_read_int32(qtmovie->stream);//0x15000414 ???? | 139 | temp=stream_read_int32(qtmovie->stream);//0x15000414 ???? |
140 | maxBitrate = stream_read_int32(qtmovie->stream); | 140 | maxBitrate = stream_read_int32(qtmovie->stream); |
141 | avgBitrate = stream_read_int32(qtmovie->stream); | 141 | avgBitrate = stream_read_int32(qtmovie->stream); |
142 | DEBUGF("audioType=%d, maxBitrate=%ld, avgBitrate=%ld\n",audioType,maxBitrate,avgBitrate); | 142 | DEBUGF("audioType=%d, maxBitrate=%ld, avgBitrate=%ld\n",audioType, |
143 | (long)maxBitrate,(long)avgBitrate); | ||
143 | 144 | ||
144 | /* get and verify DecSpecificInfoTag */ | 145 | /* get and verify DecSpecificInfoTag */ |
145 | if (stream_read_uint8(qtmovie->stream) != 0x05) | 146 | if (stream_read_uint8(qtmovie->stream) != 0x05) |
@@ -257,7 +258,8 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len) | |||
257 | sub_chunk_len = stream_read_uint32(qtmovie->stream); | 258 | sub_chunk_len = stream_read_uint32(qtmovie->stream); |
258 | if (sub_chunk_len <= 1 || sub_chunk_len > entry_remaining) | 259 | if (sub_chunk_len <= 1 || sub_chunk_len > entry_remaining) |
259 | { | 260 | { |
260 | DEBUGF("strange size (%u) for chunk inside mp4a\n", sub_chunk_len); | 261 | DEBUGF("strange size (%lu) for chunk inside mp4a\n", |
262 | (unsigned long)sub_chunk_len); | ||
261 | return false; | 263 | return false; |
262 | } | 264 | } |
263 | 265 | ||
@@ -281,7 +283,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len) | |||
281 | return false; | 283 | return false; |
282 | } | 284 | } |
283 | 285 | ||
284 | DEBUGF("entry_remaining=%ld\n",entry_remaining); | 286 | DEBUGF("entry_remaining=%ld\n",(long)entry_remaining); |
285 | stream_skip(qtmovie->stream,entry_remaining); | 287 | stream_skip(qtmovie->stream,entry_remaining); |
286 | 288 | ||
287 | } else { | 289 | } else { |
@@ -379,7 +381,7 @@ static bool read_chunk_stsz(qtmovie_t *qtmovie, size_t chunk_len) | |||
379 | 381 | ||
380 | if (v > 0x0000ffff) | 382 | if (v > 0x0000ffff) |
381 | { | 383 | { |
382 | DEBUGF("stsz[%d] > 65 kB (%ld)\n", i, v); | 384 | DEBUGF("stsz[%d] > 65 kB (%ld)\n", i, (long)v); |
383 | return false; | 385 | return false; |
384 | } | 386 | } |
385 | 387 | ||
@@ -488,7 +490,8 @@ static bool read_chunk_stbl(qtmovie_t *qtmovie, size_t chunk_len) | |||
488 | sub_chunk_len = stream_read_uint32(qtmovie->stream); | 490 | sub_chunk_len = stream_read_uint32(qtmovie->stream); |
489 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) | 491 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) |
490 | { | 492 | { |
491 | DEBUGF("strange size (%u) for chunk inside stbl\n", sub_chunk_len); | 493 | DEBUGF("strange size (%lu) for chunk inside stbl\n", |
494 | (unsigned long)sub_chunk_len); | ||
492 | return false; | 495 | return false; |
493 | } | 496 | } |
494 | 497 | ||
@@ -545,7 +548,7 @@ static bool read_chunk_minf(qtmovie_t *qtmovie, size_t chunk_len) | |||
545 | 548 | ||
546 | if ((i = stream_read_uint32(qtmovie->stream)) != 16) | 549 | if ((i = stream_read_uint32(qtmovie->stream)) != 16) |
547 | { | 550 | { |
548 | DEBUGF("unexpected size in media info: %ld\n",i); | 551 | DEBUGF("unexpected size in media info: %ld\n", (long)i); |
549 | stream_skip(qtmovie->stream, size_remaining-4); | 552 | stream_skip(qtmovie->stream, size_remaining-4); |
550 | return true; | 553 | return true; |
551 | } | 554 | } |
@@ -569,7 +572,8 @@ static bool read_chunk_minf(qtmovie_t *qtmovie, size_t chunk_len) | |||
569 | 572 | ||
570 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) | 573 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) |
571 | { | 574 | { |
572 | DEBUGF("strange size (%u) for chunk inside minf\n", sub_chunk_len); | 575 | DEBUGF("strange size (%lu) for chunk inside minf\n", |
576 | (unsigned long)sub_chunk_len); | ||
573 | return false; | 577 | return false; |
574 | } | 578 | } |
575 | 579 | ||
@@ -606,7 +610,8 @@ static bool read_chunk_mdia(qtmovie_t *qtmovie, size_t chunk_len) | |||
606 | sub_chunk_len = stream_read_uint32(qtmovie->stream); | 610 | sub_chunk_len = stream_read_uint32(qtmovie->stream); |
607 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) | 611 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) |
608 | { | 612 | { |
609 | DEBUGF("strange size (%u) for chunk inside mdia\n", sub_chunk_len); | 613 | DEBUGF("strange size (%lu) for chunk inside mdia\n", |
614 | (unsigned long)sub_chunk_len); | ||
610 | return false; | 615 | return false; |
611 | } | 616 | } |
612 | 617 | ||
@@ -644,7 +649,8 @@ static bool read_chunk_trak(qtmovie_t *qtmovie, size_t chunk_len) | |||
644 | sub_chunk_len = stream_read_uint32(qtmovie->stream); | 649 | sub_chunk_len = stream_read_uint32(qtmovie->stream); |
645 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) | 650 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) |
646 | { | 651 | { |
647 | DEBUGF("strange size (%u) for chunk inside trak\n", sub_chunk_len); | 652 | DEBUGF("strange size (%lu) for chunk inside trak\n", |
653 | (unsigned long)sub_chunk_len); | ||
648 | return false; | 654 | return false; |
649 | } | 655 | } |
650 | 656 | ||
@@ -682,7 +688,8 @@ static bool read_chunk_moov(qtmovie_t *qtmovie, size_t chunk_len) | |||
682 | sub_chunk_len = stream_read_uint32(qtmovie->stream); | 688 | sub_chunk_len = stream_read_uint32(qtmovie->stream); |
683 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) | 689 | if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) |
684 | { | 690 | { |
685 | DEBUGF("strange size (%u) for chunk inside moov\n", sub_chunk_len); | 691 | DEBUGF("strange size (%lu) for chunk inside moov\n", |
692 | (unsigned long)sub_chunk_len); | ||
686 | return false; | 693 | return false; |
687 | } | 694 | } |
688 | 695 | ||