Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove #undefs for formerly forbidden system functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/73/head
Michael Niedermayer 11 years ago
commit 48f37664a8
  1. 2
      compat/getopt.c
  2. 2
      libavcodec/dct-test.c
  3. 2
      libavcodec/dvbsubdec.c
  4. 3
      libavcodec/dvdsubdec.c

@ -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…
Cancel
Save