Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/golomb-test.c1
-rw-r--r--libavcodec/iirfilter.c1
-rw-r--r--libavcodec/libaacplus.c2
-rw-r--r--libavcodec/libfaac.c2
4 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/golomb-test.c b/libavcodec/golomb-test.c
index 54644ade46..8adcdf63d8 100644
--- a/libavcodec/golomb-test.c
+++ b/libavcodec/golomb-test.c
@@ -27,7 +27,6 @@
#include "golomb.h"
#include "put_bits.h"
-#undef fprintf
#define COUNT 8191
#define SIZE (COUNT * 4)
diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c
index 3774d6ebb7..610add12d4 100644
--- a/libavcodec/iirfilter.c
+++ b/libavcodec/iirfilter.c
@@ -312,7 +312,6 @@ av_cold void ff_iir_filter_free_coeffs(struct FFIIRFilterCoeffs *coeffs)
}
#ifdef TEST
-#undef printf
#include <stdio.h>
#define FILT_ORDER 4
diff --git a/libavcodec/libaacplus.c b/libavcodec/libaacplus.c
index 7872fecf4a..e9e50f8fe9 100644
--- a/libavcodec/libaacplus.c
+++ b/libavcodec/libaacplus.c
@@ -92,9 +92,7 @@ static av_cold int aacPlus_encode_init(AVCodecContext *avctx)
avctx->extradata_size = decoder_specific_info_size;
memcpy(avctx->extradata, buffer, avctx->extradata_size);
}
-#undef free
free(buffer);
-#define free please_use_av_free
}
return 0;
}
diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c
index a7bf503b3c..d922fdca1b 100644
--- a/libavcodec/libfaac.c
+++ b/libavcodec/libfaac.c
@@ -158,9 +158,7 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx)
memcpy(avctx->extradata, buffer, avctx->extradata_size);
faac_cfg->outputFormat = 0;
}
-#undef free
free(buffer);
-#define free please_use_av_free
}
if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) {