diff options
| author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
| commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
| tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /libmpcodecs/vfcap.h | |
| parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
| parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
| download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz | |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'libmpcodecs/vfcap.h')
| -rw-r--r-- | libmpcodecs/vfcap.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libmpcodecs/vfcap.h b/libmpcodecs/vfcap.h index aef75840ae..acc7ce31c6 100644 --- a/libmpcodecs/vfcap.h +++ b/libmpcodecs/vfcap.h @@ -40,14 +40,7 @@ #define VFCAP_ACCEPT_STRIDE 0x400 // filter does postprocessing (so you shouldn't scale/filter image before it) #define VFCAP_POSTPROC 0x800 -// filter can draw EOSD -#define VFCAP_EOSD 0x2000 -// filter will draw EOSD at screen resolution (without scaling) -#define VFCAP_EOSD_UNSCALED 0x4000 // used by libvo and vf_vo, indicates the VO does not support draw_slice for this format #define VOCAP_NOSLICES 0x8000 -#define VFCAP_OSD_FILTER 0x10000 // OSD is drawn in filter chain -#define VFCAP_EOSD_FILTER 0x20000 // EOSD is drawn in filter chain -#define VFCAP_EOSD_RGBA 0x40000 #endif /* MPLAYER_VFCAP_H */ |