opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-26 18:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change semantic of CONFIG_*, HAVE_* and ARCH_*.

Browse Source 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2009-01-13 23:44:16 +00:00
parent 959da985b0
commit b250f9c66d
154 changed files with 757 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ffmpeg.c
View File

@ -41,23 +41,23 @@
#include "libavutil/avstring.h"
#include "libavformat/os_support.h"
#ifdef HAVE_SYS_RESOURCE_H
#if HAVE_SYS_RESOURCE_H
#include <sys/types.h>
#include <sys/resource.h>
#elif defined(HAVE_GETPROCESSTIMES)
#elif HAVE_GETPROCESSTIMES
#include <windows.h>
#endif
#ifdef HAVE_SYS_SELECT_H
#if HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
#ifdef HAVE_TERMIOS_H
#if HAVE_TERMIOS_H
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/time.h>
#include <termios.h>
#elif defined(HAVE_CONIO_H)
#elif HAVE_CONIO_H
#include <conio.h>
#endif
#undef time //needed because HAVE_AV_CONFIG_H is defined on top
@ -295,7 +295,7 @@ typedef struct AVInputFile {
int nb_streams; /* nb streams we are aware of */
} AVInputFile;
#ifdef HAVE_TERMIOS_H
#if HAVE_TERMIOS_H
/* init terminal so that we can grab keys */
static struct termios oldtty;
@ -303,7 +303,7 @@ static struct termios oldtty;
static void term_exit(void)
{
#ifdef HAVE_TERMIOS_H
#if HAVE_TERMIOS_H
tcsetattr (0, TCSANOW, &oldtty);
#endif
}
@ -319,7 +319,7 @@ sigterm_handler(int sig)
static void term_init(void)
{
#ifdef HAVE_TERMIOS_H
#if HAVE_TERMIOS_H
struct termios tty;
tcgetattr (0, &tty);
@ -344,7 +344,7 @@ static void term_init(void)
register a function to be called at normal program termination
*/
atexit(term_exit);
#ifdef CONFIG_BEOS_NETSERVER
#if CONFIG_BEOS_NETSERVER
fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
#endif
}
@ -352,10 +352,10 @@ static void term_init(void)
/* read a key without blocking */
static int read_key(void)
{
#if defined(HAVE_TERMIOS_H)
#if HAVE_TERMIOS_H
int n = 1;
unsigned char ch;
#ifndef CONFIG_BEOS_NETSERVER
#if !CONFIG_BEOS_NETSERVER
struct timeval tv;
fd_set rfds;
@ -372,7 +372,7 @@ static int read_key(void)
return n;
}
#elif defined(HAVE_CONIO_H)
#elif HAVE_CONIO_H
if(kbhit())
return(getch());
#endif
@ -427,7 +427,7 @@ static int av_exit(int ret)
av_free(video_standard);
#ifdef CONFIG_POWERPC_PERF
#if CONFIG_POWERPC_PERF
void powerpc_display_perf_report(void);
powerpc_display_perf_report();
#endif /* CONFIG_POWERPC_PERF */
@ -2553,7 +2553,7 @@ static void opt_top_field_first(const char *arg)
static int opt_thread_count(const char *opt, const char *arg)
{
thread_count= parse_number_or_die(opt, arg, OPT_INT64, 0, INT_MAX);
#if !defined(HAVE_THREADS)
#if !HAVE_THREADS
if (verbose >= 0)
fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n");
#endif
@ -2626,7 +2626,7 @@ static void opt_video_tag(const char *arg)
video_codec_tag= arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24);
}
#ifdef CONFIG_VHOOK
#if CONFIG_VHOOK
static void add_frame_hooker(const char *arg)
{
int argc = 0;
@ -3416,12 +3416,12 @@ static void opt_pass(const char *pass_str)
static int64_t getutime(void)
{
#ifdef HAVE_GETRUSAGE
#if HAVE_GETRUSAGE
struct rusage rusage;
getrusage(RUSAGE_SELF, &rusage);
return (rusage.ru_utime.tv_sec * 1000000LL) + rusage.ru_utime.tv_usec;
#elif defined(HAVE_GETPROCESSTIMES)
#elif HAVE_GETPROCESSTIMES
HANDLE proc;
FILETIME c, e, k, u;
proc = GetCurrentProcess();
@ -3828,7 +3828,7 @@ static const OptionDef options[] = {
{ "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
{ "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
{ "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
#ifdef CONFIG_VHOOK
#if CONFIG_VHOOK
{ "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
#endif
{ "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },