diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 18:55:18 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 18:55:18 +0300 |
| commit | 497c32cdadb9da9bc20a3650b3056e2657358136 (patch) | |
| tree | ed3d48e5f9631d2951d8569b48a00d025c20ab08 /cfg-common-opts.h | |
| parent | 626373af3840220d40217b7bbe81f5fb452882bb (diff) | |
| parent | def243261a0b8e3ab0d043cd89b97f8c9826e573 (diff) | |
| download | mpv-497c32cdadb9da9bc20a3650b3056e2657358136.tar.bz2 mpv-497c32cdadb9da9bc20a3650b3056e2657358136.tar.xz | |
Merge svn changes up to r31291
Diffstat (limited to 'cfg-common-opts.h')
| -rw-r--r-- | cfg-common-opts.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 8b364189ee..614392a0b9 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -70,6 +70,7 @@ {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, {"user-agent", &network_useragent, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"referrer", &network_referrer, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"cookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nocookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"cookies-file", &cookies_file, CONF_TYPE_STRING, 0, 0, 0, NULL}, @@ -255,7 +256,6 @@ {"tsfastparse", "-tsfastparse is no longer a valid option.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL }, {"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL}, -#define TS_MAX_PROBE_SIZE 2000000 /* don't forget to change this in libmpdemux/demux_ts.c too */ {"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, {"psprobe", &ps_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, {"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |