From 034ef0e8c366f032cd9efab14daca3959768e4c1 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Tue, 13 Feb 2007 08:21:47 +0000
Subject: [PATCH] Move base64.[ch] to libavutil. patch by Carl Eugen Hoyos,
cehoyos ag.or at
Originally committed as revision 7963 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/Makefile | 2 +-
libavutil/Makefile | 1 +
{libavformat => libavutil}/base64.c | 0
{libavformat => libavutil}/base64.h | 13 +++++++++++--
4 files changed, 13 insertions(+), 3 deletions(-)
rename {libavformat => libavutil}/base64.c (100%)
rename {libavformat => libavutil}/base64.h (84%)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index a57f797d863..1fbfd38a722 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -166,7 +166,7 @@ OBJS+= avio.o aviobuf.o
ifeq ($(CONFIG_PROTOCOLS),yes)
OBJS+= file.o
ifeq ($(CONFIG_NETWORK),yes)
-OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o
+OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o rtp_h264.o
endif
endif
diff --git a/libavutil/Makefile b/libavutil/Makefile
index f4b1766d838..a2e35e708c0 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -19,6 +19,7 @@ OBJS= mathematics.o \
lzo.o \
random.o \
aes.o \
+ base64.o \
HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
intfloat_readwrite.h md5.h adler32.h log.h fifo.h lzo.h \
diff --git a/libavformat/base64.c b/libavutil/base64.c
similarity index 100%
rename from libavformat/base64.c
rename to libavutil/base64.c
diff --git a/libavformat/base64.h b/libavutil/base64.h
similarity index 84%
rename from libavformat/base64.h
rename to libavutil/base64.h
index 03d43afe4dc..5658ee837a7 100644
--- a/libavformat/base64.h
+++ b/libavutil/base64.h
@@ -19,6 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-int av_base64_decode(uint8_t * out, const char *in, int out_length); // param order as strncpy()
-char *av_base64_encode(uint8_t * src, int len); // src is not a string, it's data.
+/**
+ * decodes base64
+ * param order as strncpy()
+ */
+int av_base64_decode(uint8_t * out, const char *in, int out_length);
+
+/**
+ * encodes base64
+ * @param src data, not a string
+ */
+char *av_base64_encode(uint8_t * src, int len);
--
GitLab