]>
Commit | Line | Data |
---|---|---|
eb09a04b JB |
1 | --- mp4v2-2.0.0/src/mp4util.cpp.orig 2012-05-21 00:11:53.000000000 +0200 |
2 | +++ mp4v2-2.0.0/src/mp4util.cpp 2012-12-07 19:20:16.380127762 +0100 | |
3 | @@ -195,6 +195,9 @@ | |
4 | return true; | |
5 | } | |
6 | ||
7 | +}} // namespace mp4v2::impl | |
8 | + | |
9 | +extern "C" | |
10 | uint8_t *Base64ToBinary (const char *pData, uint32_t decodeSize, uint32_t *pDataSize) | |
11 | { | |
12 | uint8_t *ret; | |
13 | @@ -208,7 +211,7 @@ | |
14 | } | |
15 | size = (decodeSize * 3) / 4; | |
16 | groups = decodeSize / 4; | |
17 | - ret = (uint8_t *)MP4Calloc(size); | |
18 | + ret = (uint8_t *)mp4v2::impl::MP4Calloc(size); | |
19 | if (ret == NULL) return NULL; | |
20 | for (ix = 0; ix < groups; ix++) { | |
21 | uint8_t value[4]; | |
22 | @@ -220,7 +223,7 @@ | |
23 | } | |
24 | size--; | |
25 | value[jx] = 0; | |
26 | - } else if (convertBase64(pData[jx], &value[jx]) == false) { | |
27 | + } else if (mp4v2::impl::convertBase64(pData[jx], &value[jx]) == false) { | |
28 | free(ret); | |
29 | return NULL; | |
30 | } | |
31 | @@ -234,6 +237,8 @@ | |
32 | return ret; | |
33 | } | |
34 | ||
35 | +namespace mp4v2 { namespace impl { | |
36 | + | |
37 | // log2 of value, rounded up | |
38 | static uint8_t ilog2(uint64_t value) | |
39 | { |