* qatar/master: (22 commits) aacdec: Fix PS in ADTS. avconv: Consistently use PIX_FMT_NONE. dsputil: use cpuflags in x86 emu_edge_core dsputil: use movups instead of movdqu in ff_emu_edge_core_sse() wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits. mov: Remove some redundant and obsolete comments. Add libavutil/mathematics.h #includes for INFINITY doxy: structure libavformat groups doxy: introduce an empty structure in libavcodec doxy: provide a start page and document libavutil doxy: cleanup pixfmt.h regtest: split video encode/decode tests into individual targets ARM: add explicit .arch and .fpu directives to asm.S pthread: do not touch has_b_frames avconv: cleanup the transcoding loop in output_packet(). avconv: split subtitle transcoding out of output_packet(). avconv: split video transcoding out of output_packet(). avconv: split audio transcoding out of output_packet(). avconv: reindent. avconv: move streamcopy-only code out of decoding loop. ... Conflicts: avconv.c libavcodec/aaccoder.c libavcodec/pthread.c libavcodec/version.h libavutil/audioconvert.h libavutil/avutil.h libavutil/mem.h tests/ref/vsynth1/dv tests/ref/vsynth1/mpeg2thread tests/ref/vsynth2/dv tests/ref/vsynth2/mpeg2thread Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			66 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			66 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
 | 
						|
 *
 | 
						|
 * This file is part of FFmpeg.
 | 
						|
 *
 | 
						|
 * FFmpeg 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,
 | 
						|
 * 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
 | 
						|
 * 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
 | 
						|
 * @{
 | 
						|
 */
 | 
						|
 | 
						|
 | 
						|
/**
 | 
						|
 * 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
 | 
						|
 */
 | 
						|
char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
 | 
						|
 | 
						|
/**
 | 
						|
 * Calculate the output size needed to base64-encode x bytes.
 | 
						|
 */
 | 
						|
#define AV_BASE64_SIZE(x)  (((x)+2) / 3 * 4 + 1)
 | 
						|
 | 
						|
 /**
 | 
						|
  * @}
 | 
						|
  */
 | 
						|
 | 
						|
#endif /* AVUTIL_BASE64_H */
 |