Don't overwrite user-supplied metadata with metadata mapped from an input file.

[ffmpeg] / libavutil / base64.c

diff --git a/libavutil/base64.c b/libavutil/base64.c
index e6b46d63e6eeaf0fc143a1dcf2be628e89f5d594..60e35a81b319d54d6c04ea0a19eaf7eba1c051b4 100644 (file)
--- a/libavutil/base64.c
+++ b/libavutil/base64.c
@@ -42,7 +42,7 @@ static const uint8_t map2[] =
     0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33
 };
 
-int av_base64_decode(uint8_t * out, const char *in, int out_size)
+int av_base64_decode(uint8_t *out, const char *in, int out_size)
 {
     int i, v;
     uint8_t *dst = out;
@@ -69,17 +69,17 @@ 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 *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) {
@@ -106,7 +106,8 @@ char *av_base64_encode(char *out, int out_size, const uint8_t *in, int size)
 #define MAX_DATA_SIZE    1024
 #define MAX_ENCODED_SIZE 2048
 
-int test_encode_decode(const uint8_t *data, unsigned int data_size, const char *encoded_ref)
+static int test_encode_decode(const uint8_t *data, unsigned int data_size,
+                              const char *encoded_ref)
 {
     char  encoded[MAX_ENCODED_SIZE];
     uint8_t data2[MAX_DATA_SIZE];