har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use AV_BASE64_SIZE() macro

Browse Source 
Originally committed as revision 23462 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Howard Chu 2010-06-04 01:15:41 +00:00
parent 31878fcf43
commit 784824a68c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libtheoraenc.c
View File

@ -101,7 +101,7 @@ static int get_stats(AVCodecContext *avctx, int eos)
memcpy(h->stats + h->stats_offset, buf, bytes); memcpy(h->stats + h->stats_offset, buf, bytes);
h->stats_offset += bytes; h->stats_offset += bytes;
} else { } else {
int b64_size = ((h->stats_offset + 2) / 3) * 4 + 1; int b64_size = AV_BASE64_SIZE(h->stats_offset);
// libtheora generates a summary header at the end // libtheora generates a summary header at the end
memcpy(h->stats, buf, bytes); memcpy(h->stats, buf, bytes);
avctx->stats_out = av_malloc(b64_size); avctx->stats_out = av_malloc(b64_size);

2
libavformat/httpauth.c
View File

@ -294,7 +294,7 @@ char *ff_http_auth_create_response(HTTPAuthState *state, const char *auth,
return NULL; return NULL;
if (state->auth_type == HTTP_AUTH_BASIC) { if (state->auth_type == HTTP_AUTH_BASIC) {
int auth_b64_len = (strlen(auth) + 2) / 3 * 4 + 1; int auth_b64_len = AV_BASE64_SIZE(strlen(auth));
int len = auth_b64_len + 30; int len = auth_b64_len + 30;
char *ptr; char *ptr;
authstr = av_malloc(len); authstr = av_malloc(len);

2
libavutil/base64.c
View File

@ -79,7 +79,7 @@ char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size)
int bytes_remaining = in_size; int bytes_remaining = in_size;
if (in_size >= UINT_MAX / 4 || if (in_size >= UINT_MAX / 4 ||
out_size < (in_size+2) / 3 * 4 + 1) out_size < AV_BASE64_SIZE(in_size))
return NULL; return NULL;
ret = dst = out; ret = dst = out;
while (bytes_remaining) { while (bytes_remaining) {