Browse Source

Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
48f37664a8
4 changed files with 0 additions and 9 deletions
  1. +0
    -2
      compat/getopt.c
  2. +0
    -2
      libavcodec/dct-test.c
  3. +0
    -2
      libavcodec/dvbsubdec.c
  4. +0
    -3
      libavcodec/dvdsubdec.c

+ 0
- 2
compat/getopt.c View File

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


+ 0
- 2
libavcodec/dct-test.c View File

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


+ 0
- 2
libavcodec/dvbsubdec.c View File

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


+ 0
- 3
libavcodec/dvdsubdec.c View File

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