lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

Merge commit 'cb45553f57'

Browse source 
* commit 'cb45553f57':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
	doc/examples/muxing.c
	libavfilter/filtfmts.c
	libavutil/des.c
	libavutil/eval.c
	libavutil/log.c
	libavutil/parseutils.c
	tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-05 13:25:23 +01:00
commit 99efd59626
34 changed files with 20 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavutil/base64.c
View file

@ -175,8 +175,6 @@ char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size)
#ifdef TEST
// LCOV_EXCL_START
#undef printf
#define MAX_DATA_SIZE 1024
#define MAX_ENCODED_SIZE 2048