virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Remove pointless #undefs of previously forbidden functions.

Browse Source
This commit is contained in:
Anton Khirnov 2012-10-20 15:22:41 +02:00
parent 90153465b0
commit cb45553f57
28 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/golomb-test.c
View File

@ -25,7 +25,6 @@
#include "golomb.h"
#include "put_bits.h"
#undef fprintf
#define COUNT 8191
#define SIZE (COUNT * 4)

1
libavcodec/iirfilter.c
View File

@ -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

2
libavcodec/libfaac.c
View File

@ -159,9 +159,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)) {

3
libavdevice/libcdio.c
View File

@ -33,9 +33,6 @@
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
/* cdio returns some malloced strings that need to be free()d */
#undef free
typedef struct CDIOContext {
AVClass *class;
cdrom_drive_t *drive;

2
libavdevice/libdc1394.c
View File

@ -48,8 +48,6 @@
#define DC1394_FRAMERATE_240 FRAMERATE_240
#endif
#undef free
typedef struct dc1394_data {
AVClass *class;
#if HAVE_LIBDC1394_1

2
libavdevice/timefilter.c
View File

@ -78,8 +78,6 @@ double ff_timefilter_update(TimeFilter *self, double system_time, double period)
#include "libavutil/lfg.h"
#define LFG_MAX ((1LL << 32) - 1)
#undef printf
int main(void)
{
AVLFG prng;

3
libavfilter/filtfmts.c
View File

@ -25,9 +25,6 @@
#include "libavfilter/avfilter.h"
#include "libavfilter/formats.h"
#undef fprintf
#undef printf
int main(int argc, char **argv)
{
AVFilter *filter;

2
libavfilter/vf_drawtext.c
View File

@ -46,8 +46,6 @@
#include "internal.h"
#include "video.h"
#undef time
#include <ft2build.h>
#include <freetype/config/ftheader.h>
#include FT_FREETYPE_H

2
libavformat/network.c
View File

@ -57,8 +57,6 @@ static unsigned long openssl_thread_id(void)
#if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
#include <gcrypt.h>
#include <errno.h>
#undef malloc
#undef free
GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif
#endif

2
libavformat/output-example.c
View File

@ -38,8 +38,6 @@
#include "libavformat/avformat.h"
#include "libswscale/swscale.h"
#undef exit
/* 5 seconds stream duration */
#define STREAM_DURATION 5.0
#define STREAM_FRAME_RATE 25 /* 25 images/s */

3
libavformat/seek-test.c
View File

@ -28,9 +28,6 @@
#include "libavutil/mathematics.h"
#include "libavformat/avformat.h"
#undef printf
#undef fprintf
static char buffer[20];
static const char *ret_str(int v)

3
libavformat/url-test.c
View File

@ -20,9 +20,6 @@
#include "internal.h"
#undef printf
#undef exit
static void test(const char *base, const char *rel)
{
char buf[200], buf2[200];

2
libavformat/utils.c
View File

@ -3092,7 +3092,6 @@ static void hex_dump_internal(void *avcl, FILE *f, int level,
const uint8_t *buf, int size)
{
int len, i, j, c;
#undef fprintf
#define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
for(i=0;i<size;i+=16) {
@ -3130,7 +3129,6 @@ void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size)
static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int dump_payload, AVRational time_base)
{
#undef fprintf
#define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
PRINT("stream #%d:\n", pkt->stream_index);
PRINT(" keyframe=%d\n", ((pkt->flags & AV_PKT_FLAG_KEY) != 0));

1
libavutil/avstring.c
View File

@ -159,7 +159,6 @@ int av_strncasecmp(const char *a, const char *b, size_t n)
#ifdef TEST
#include "common.h"
#undef printf
int main(void)
{

2
libavutil/base64.c
View File

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

2
libavutil/blowfish.c
View File

@ -428,7 +428,6 @@ void av_blowfish_crypt(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
#ifdef TEST
#include <stdio.h>
#undef printf
#define NUM_VARIABLE_KEY_TESTS 34
@ -531,7 +530,6 @@ static const uint8_t ciphertext2[16] = {
#define IV "blowfish"
#undef exit
static void test_blowfish(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
const uint8_t *ref, int len, uint8_t *iv, int dir,
const char *test)

1
libavutil/cpu.c
View File

@ -111,7 +111,6 @@ int av_parse_cpu_flags(const char *s)
#ifdef TEST
#undef printf
#include <stdio.h>
static const struct {

1
libavutil/crc.c
View File

@ -113,7 +113,6 @@ uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
}
#ifdef TEST
#undef printf
int main(void)
{
uint8_t buf[1999];

3
libavutil/des.c
View File

@ -337,9 +337,6 @@ void av_des_mac(AVDES *d, uint8_t *dst, const uint8_t *src, int count) {
}
#ifdef TEST
#undef printf
#undef rand
#undef srand
#include <stdlib.h>
#include <stdio.h>
#include "libavutil/time.h"

1
libavutil/eval.c
View File

@ -545,7 +545,6 @@ int av_expr_parse_and_eval(double *d, const char *s,
}
#ifdef TEST
#undef printf
#include <string.h>
static const double const_values[] = {

2
libavutil/fifo.c
View File

@ -130,8 +130,6 @@ void av_fifo_drain(AVFifoBuffer *f, int size)
#ifdef TEST
#undef printf
int main(void)
{
/* create a FIFO buffer */

2
libavutil/log.c
View File

@ -55,7 +55,6 @@ static const uint8_t color[] = { 0x41, 0x41, 0x11, 0x03, 9, 0x02, 0x06 };
#endif
static int use_color = -1;
#undef fprintf
static void colored_fputs(int level, const char *str)
{
if (use_color < 0) {
@ -104,7 +103,6 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
if (level > av_log_level)
return;
line[0] = 0;
#undef fprintf
if (print_prefix && avc) {
if (avc->parent_log_context_offset) {
AVClass** parent = *(AVClass ***) (((uint8_t *) ptr) +

1
libavutil/md5.c
View File

@ -182,7 +182,6 @@ void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len)
}
#ifdef TEST
#undef printf
#include <stdio.h>
static void print_md5(uint8_t *md5)

5
libavutil/mem.c
View File

@ -38,11 +38,6 @@
#include "intreadwrite.h"
#include "mem.h"
/* here we can use OS-dependent allocation functions */
#undef free
#undef malloc
#undef realloc
#ifdef MALLOC_PREFIX
#define malloc AV_JOIN(MALLOC_PREFIX, malloc)

2
libavutil/opt.c
View File

@ -685,8 +685,6 @@ const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *pre
#ifdef TEST
#undef printf
typedef struct TestContext
{
const AVClass *class;

3
libavutil/parseutils.c
View File

@ -498,7 +498,6 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
char lastch;
int negative = 0;
#undef time
time_t now = time(0);
len = strlen(timestr);
@ -643,8 +642,6 @@ int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info
#ifdef TEST
#undef printf
int main(void)
{
printf("Testing av_parse_video_rate()\n");

1
libavutil/sha.c
View File

@ -334,7 +334,6 @@ void av_sha_final(AVSHA* ctx, uint8_t *digest)
#ifdef TEST
#include <stdio.h>
#undef printf
int main(void)
{

2
libavutil/xtea.c
View File

@ -101,7 +101,6 @@ void av_xtea_crypt(AVXTEA *ctx, uint8_t *dst, const uint8_t *src, int count,
#ifdef TEST
#include <stdio.h>
#undef printf
#define XTEA_NUM_TESTS 6
@ -138,7 +137,6 @@ static const uint8_t xtea_test_ct[XTEA_NUM_TESTS][8] = {
{ 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41 }
};
#undef exit
static void test_xtea(AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
const uint8_t *ref, int len, uint8_t *iv, int dir,
const char *test)