diff options
| author |  Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
| commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
| tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /vidix/vidix.h | |
| parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
| parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'vidix/vidix.h')
| -rw-r--r-- | vidix/vidix.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/vidix/vidix.h b/vidix/vidix.h index 0a61adc6db..01a998b004 100644 --- a/vidix/vidix.h +++ b/vidix/vidix.h @@ -36,12 +36,6 @@ #ifndef MPLAYER_VIDIX_H #define MPLAYER_VIDIX_H -#ifdef __cplusplus -extern "C" { -#endif - -#define VIDIX_VERSION 100 - #define PROBE_NORMAL 0 /* normal probing */ #define PROBE_FORCE 1 /* ignore device_id but recognize device if it's known */ @@ -311,8 +305,4 @@ typedef struct vidix_oem_fx_s char *name[80]; /* effect name to display */ } vidix_oem_fx_t; -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_VIDIX_H */ |