[FFmpeg-cvslog] r17071 - in trunk/libavutil: base64.c base64.h
stefano
subversion
Sun Feb 8 22:16:36 CET 2009
Author: stefano
Date: Sun Feb 8 22:16:36 2009
New Revision: 17071
Log:
Cosmetics: rename the "size" parameter of av_base64_encode() as
"in_size".
Modified:
trunk/libavutil/base64.c
trunk/libavutil/base64.h
Modified: trunk/libavutil/base64.c
==============================================================================
--- trunk/libavutil/base64.c Sun Feb 8 22:14:46 2009 (r17070)
+++ trunk/libavutil/base64.c Sun Feb 8 22:16:36 2009 (r17071)
@@ -69,17 +69,17 @@ int av_base64_decode(uint8_t * out, cons
* Fixed edge cases and made it work from data (vs. strings) by Ryan.
*****************************************************************************/
-char *av_base64_encode(char *out, int out_size, const uint8_t *in, int size)
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size)
{
static const char b64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
char *ret, *dst;
unsigned i_bits = 0;
int i_shift = 0;
- int bytes_remaining = size;
+ int bytes_remaining = in_size;
- if (size >= UINT_MAX / 4 ||
- out_size < (size+2) / 3 * 4 + 1)
+ if (in_size >= UINT_MAX / 4 ||
+ out_size < (in_size+2) / 3 * 4 + 1)
return NULL;
ret = dst = out;
while (bytes_remaining) {
Modified: trunk/libavutil/base64.h
==============================================================================
--- trunk/libavutil/base64.h Sun Feb 8 22:14:46 2009 (r17070)
+++ trunk/libavutil/base64.h Sun Feb 8 22:16:36 2009 (r17071)
@@ -34,6 +34,6 @@ int av_base64_decode(uint8_t * out, cons
* @param src data, not a string
* @param buf output string
*/
-char *av_base64_encode(char *out, int out_size, const uint8_t *in, int size);
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
#endif /* AVUTIL_BASE64_H */
More information about the ffmpeg-cvslog
mailing list