mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: Remove #undefs for formerly forbidden system functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
48f37664a8
@ -38,8 +38,6 @@ static int optind = 1;
|
||||
static int optopt;
|
||||
static char *optarg;
|
||||
|
||||
#undef fprintf
|
||||
|
||||
static int getopt(int argc, char *argv[], char *opts)
|
||||
{
|
||||
static int sp = 1;
|
||||
|
@ -47,8 +47,6 @@
|
||||
#include "x86/idct_xvid.h"
|
||||
#include "dctref.h"
|
||||
|
||||
#undef printf
|
||||
|
||||
// BFIN
|
||||
void ff_bfin_idct(int16_t *block);
|
||||
void ff_bfin_fdct(int16_t *block);
|
||||
|
@ -34,8 +34,6 @@
|
||||
#define cm (ff_cropTbl + MAX_NEG_CROP)
|
||||
|
||||
#ifdef DEBUG
|
||||
#undef fprintf
|
||||
#undef perror
|
||||
#if 0
|
||||
static void png_save(const char *filename, uint8_t *bitmap, int w, int h,
|
||||
uint32_t *rgba_palette)
|
||||
|
@ -462,9 +462,6 @@ static int find_smallest_bounding_rectangle(AVSubtitle *s)
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
#undef fprintf
|
||||
#undef perror
|
||||
#undef exit
|
||||
static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h,
|
||||
uint32_t *rgba_palette)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user