Commit 034ef0e8 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos Committed by Diego Biurrun
Browse files

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
parent 674678b0
...@@ -166,7 +166,7 @@ OBJS+= avio.o aviobuf.o ...@@ -166,7 +166,7 @@ OBJS+= avio.o aviobuf.o
ifeq ($(CONFIG_PROTOCOLS),yes) ifeq ($(CONFIG_PROTOCOLS),yes)
OBJS+= file.o OBJS+= file.o
ifeq ($(CONFIG_NETWORK),yes) 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
endif endif
......
...@@ -19,6 +19,7 @@ OBJS= mathematics.o \ ...@@ -19,6 +19,7 @@ OBJS= mathematics.o \
lzo.o \ lzo.o \
random.o \ random.o \
aes.o \ aes.o \
base64.o \
HEADERS = avutil.h common.h mathematics.h integer.h rational.h \ HEADERS = avutil.h common.h mathematics.h integer.h rational.h \
intfloat_readwrite.h md5.h adler32.h log.h fifo.h lzo.h \ intfloat_readwrite.h md5.h adler32.h log.h fifo.h lzo.h \
......
...@@ -19,6 +19,15 @@ ...@@ -19,6 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment