diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-02 01:47:14 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-02 01:47:14 +0000 |
commit | 8ba23bb01714490753ea802782499b09fbcf9440 (patch) | |
tree | b1291a0c1fcfa458fb67e631e07fecb081ac7129 /third_party/ffmpeg/include/libavutil/base64.h | |
parent | f3778aefd8b63bc818d102fed2606639f512bc19 (diff) | |
download | chromium_src-8ba23bb01714490753ea802782499b09fbcf9440.zip chromium_src-8ba23bb01714490753ea802782499b09fbcf9440.tar.gz chromium_src-8ba23bb01714490753ea802782499b09fbcf9440.tar.bz2 |
Update public FFmpeg header files from r16647 to r18286.
This also includes bumping the version of avutil from 49 to 50, which means the generated libs and build files are also updated.
Review URL: http://codereview.chromium.org/56129
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg/include/libavutil/base64.h')
-rw-r--r-- | third_party/ffmpeg/include/libavutil/base64.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/third_party/ffmpeg/include/libavutil/base64.h b/third_party/ffmpeg/include/libavutil/base64.h index 91df541..e3152eb 100644 --- a/third_party/ffmpeg/include/libavutil/base64.h +++ b/third_party/ffmpeg/include/libavutil/base64.h @@ -1,5 +1,4 @@ /* - * Base64.c * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com) * * This file is part of FFmpeg. @@ -25,16 +24,26 @@ #include <stdint.h> /** - * decodes base64 - * param order as strncpy() + * Decodes the base64-encoded string in \p in and puts the decoded + * data in \p out. + * + * @param out_size size in bytes of the \p out buffer, it should be at + * least 3/4 of the length of \p in + * @return the number of bytes written, or a negative value in case of + * error */ -int av_base64_decode(uint8_t * out, const char *in, int out_length); +int av_base64_decode(uint8_t *out, const char *in, int out_size); /** - * encodes base64 - * @param src data, not a string - * @param buf output string + * Encodes in base64 the data in \p in and puts the resulting string + * in \p out. + * + * @param out_size size in bytes of the \p out string, it should be at + * least ((\p in_size + 2) / 3) * 4 + 1 + * @param in_size size in bytes of the \p in buffer + * @return the string containing the encoded data, or NULL in case of + * error */ -char *av_base64_encode(char * buf, int buf_len, const uint8_t * src, int len); +char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size); #endif /* AVUTIL_BASE64_H */ |