Cosmetics: prefer out/in over buf/src for the parameters names of

av_base64_decode, for consistency/readability reasons.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17069 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavutil/base64.c b/libavutil/base64.c
index bed5d7e0cad518cc1edcfaba103f1d88b0514f42..e6b46d63e6eeaf0fc143a1dcf2be628e89f5d594 100644 (file)
--- a/libavutil/base64.c
+++ b/libavutil/base64.c
@@ -69,7 +69,7 @@ int av_base64_decode(uint8_t * out, const char *in, int out_size)
 * Fixed edge cases and made it work from data (vs. strings) by Ryan.
 *****************************************************************************/
 
-char *av_base64_encode(char * buf, int buf_size, const uint8_t * src, int size)
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int size)
 {
     static const char b64[] =
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -79,11 +79,11 @@ char *av_base64_encode(char * buf, int buf_size, const uint8_t * src, int size)
     int bytes_remaining = size;
 
     if (size >= UINT_MAX / 4 ||
-        buf_size < (size+2) / 3 * 4 + 1)
+        out_size < (size+2) / 3 * 4 + 1)
         return NULL;
-    ret = dst = buf;
+    ret = dst = out;
     while (bytes_remaining) {
-        i_bits = (i_bits << 8) + *src++;
+        i_bits = (i_bits << 8) + *in++;
         bytes_remaining--;
         i_shift += 8;
 

diff --git a/libavutil/base64.h b/libavutil/base64.h
index 5bc8fe5754c7f195bb565adedf4c565009f30980..484950060899a0ca006822ffd464309687f0858a 100644 (file)
--- a/libavutil/base64.h
+++ b/libavutil/base64.h
@@ -34,6 +34,6 @@ int av_base64_decode(uint8_t * out, const char *in, int out_size);
  * @param src data, not a string
  * @param buf output string
  */
-char *av_base64_encode(char * buf, int buf_size, const uint8_t * src, int size);
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int size);
 
 #endif /* AVUTIL_BASE64_H */