configure: MMAL-related decoders should depend on, not select, mmal

[ffmpeg] / libavutil / base64.h

diff --git a/libavutil/base64.h b/libavutil/base64.h
index 8cabd01501abed0c8fc68ff2a7faa2715b40a299..4750cf5c724aeea26a3940fb8ba9ffe6264507df 100644 (file)
--- a/libavutil/base64.h
+++ b/libavutil/base64.h
@@ -1,37 +1,65 @@
 /*
- * Base64.c
  * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVUTIL_BASE64_H
+#define AVUTIL_BASE64_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_base64 Base64
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+
 /**
- * decodes base64
- * param order as strncpy()
+ * Decode a base64-encoded string.
+ *
+ * @param out      buffer for decoded data
+ * @param in       null-terminated input string
+ * @param out_size size in bytes of the out buffer, must be at
+ *                 least 3/4 of the length of in
+ * @return         number of bytes written, or a negative value in case of
+ *                 invalid input
+ */
+int av_base64_decode(uint8_t *out, const char *in, int out_size);
+
+/**
+ * Encode data to base64 and null-terminate.
+ *
+ * @param out      buffer for encoded data
+ * @param out_size size in bytes of the output buffer, must be at
+ *                 least AV_BASE64_SIZE(in_size)
+ * @param in_size  size in bytes of the 'in' buffer
+ * @return         'out' or NULL in case of error
  */
-int av_base64_decode(uint8_t * out, const char *in, int out_length);
+char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
 
 /**
- * encodes base64
- * @param out string
- * @param out_len of the string, must be at least (len * 4 / 3 + 12)
- * @param src data, not a string
- * @param len data length
- * @return the zero terminated encoded string or NULL in case of errors
+ * Calculate the output size needed to base64-encode x bytes.
  */
-char *av_base64_encode(char *out, int out_len, uint8_t * src, int len);
+#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
+
+ /**
+  * @}
+  */
 
+#endif /* AVUTIL_BASE64_H */