diff options
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 1 | ||||
| -rw-r--r-- | libavutil/base64.c (renamed from libavformat/base64.c) | 0 | ||||
| -rw-r--r-- | libavutil/base64.h (renamed from libavformat/base64.h) | 13 |
4 files changed, 13 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index a57f797d86..1fbfd38a72 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 f4b1766d83..a2e35e708c 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 index 6279244d3b..6279244d3b 100644 --- a/libavformat/base64.c +++ b/libavutil/base64.c diff --git a/libavformat/base64.h b/libavutil/base64.h index 03d43afe4d..5658ee837a 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); |