mirror of
https://github.com/mpv-player/mpv
synced 2024-08-04 14:59:58 +02:00
Merge svn changes up to r31291
This commit is contained in:
Uoti Urpala
commit
497c32cdad
@ -29,6 +29,8 @@ MPlayer (1.0)
|
||||
* remove vf_yuy2, functionality is replaced by -vf format=yuv2
|
||||
|
||||
Drivers:
|
||||
* X11: Window manager choses Window position by default.
|
||||
Add geometry=50%:50% to your configuration to get the old behaviour.
|
||||
* -vo md5sum md5 calculation changed so output matches FFmpeg's -f framemd5
|
||||
* Support for more formats in OpenGL video output drivers (different YUV
|
||||
subsampling, 16 bit per component)
|
||||
|
||||
@ -1759,6 +1759,10 @@ Play a raw YUV sample.
|
||||
.PD 1
|
||||
.
|
||||
.TP
|
||||
.B \-referrer <string> (network only)
|
||||
Specify a referrer path or URL for HTTP requests.
|
||||
.
|
||||
.TP
|
||||
.B \-rtsp\-port
|
||||
Used with 'rtsp://' URLs to force the client's port number.
|
||||
This option may be useful if you are behind a router and want to forward
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.\" Synced with r31096
|
||||
.\" Synced with r31288
|
||||
.\" MPlayer (C) 2000-2010 MPlayer Team
|
||||
.\" Ezt a man oldalt Gabucino, Diego Biurrun és Jonas Jermann készíti/készítette
|
||||
.\" Karbantartó: Gabrov
|
||||
@ -33,7 +33,7 @@
|
||||
.\" Név
|
||||
.\" --------------------------------------------------------------------------
|
||||
.
|
||||
.TH MPlayer 1 "2010. 04. 25." "MPlayer Project" "A film lejátszó"
|
||||
.TH MPlayer 1 "2010. 05. 31." "MPlayer Project" "A film lejátszó"
|
||||
.
|
||||
.SH NÉV
|
||||
mplayer \- film lejátszó
|
||||
@ -1802,6 +1802,10 @@ Nyers YUV minta lej
|
||||
.PD 1
|
||||
.
|
||||
.TP
|
||||
.B \-referrer <karakterlánc> (csak hálózaton)
|
||||
Megadja a hivatkozó elérési útját vagy URL-jét a HTTP kérésekhez.
|
||||
.
|
||||
.TP
|
||||
.B \-rtsp\-port
|
||||
Az 'rtsp://' URL-ekkel használatos a kliens port számának kényszerítésére.
|
||||
Ez az opció hasznos, ha egy router mögött vagy és továbbítani akarod az
|
||||
@ -4213,7 +4217,7 @@ Explicit megadja a haszn
|
||||
.PD 1
|
||||
.
|
||||
.TP
|
||||
.B s3fb (csak Linux) (lásd még \-vf yuv2 és \-dr)
|
||||
.B s3fb (csak Linux) (lásd még \-dr)
|
||||
S3 Virge specifikus videó kimeneti vezérlő.
|
||||
Ez a vezérlő támogatja a kártya YUV konverzióját és méretezését, a dupla
|
||||
bufferelést és a direkt renderelést.
|
||||
@ -6105,12 +6109,6 @@ legyen <r>-rel (alap
|
||||
.RE
|
||||
.
|
||||
.TP
|
||||
.B "yuy2\ \ \ "
|
||||
Szoftveres YV12/\:I420/\:422P-bõl YUY2-be konvertálást kényszerít ki.
|
||||
Hasznos lassú YV12, de gyors YUY2 támogatással rendelkezõ videó kártyák/\:vezérlõk
|
||||
esetén.
|
||||
.
|
||||
.TP
|
||||
.B "yvu9\ \ \ "
|
||||
Szoftveres YVU9-YV12 színtér konvertálást kényszerít ki.
|
||||
Idejétmúlt a szoftveres méretező miatt.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- synced with r31032 -->
|
||||
<!-- synced with r31099 -->
|
||||
<chapter id="mencoder">
|
||||
<title>A <application>MEncoder</application> használatának alapjai</title>
|
||||
|
||||
|
||||
@ -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},
|
||||
|
||||
@ -43,6 +43,7 @@ extern char *network_username;
|
||||
extern char *network_password;
|
||||
extern int network_bandwidth;
|
||||
extern char *network_useragent;
|
||||
extern char *network_referrer;
|
||||
extern int network_cookies_enabled;
|
||||
extern char *cookies_file;
|
||||
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
*/
|
||||
|
||||
#include "libmpcodecs/ve_x264.h"
|
||||
#include "libmpdemux/demux_ts.h"
|
||||
#include "cfg-common.h"
|
||||
|
||||
extern int sws_flags;
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
#include <stddef.h>
|
||||
|
||||
#include "cfg-common.h"
|
||||
#include "libmpdemux/demux_ts.h"
|
||||
#include "libvo/vo_zr.h"
|
||||
#include "options.h"
|
||||
|
||||
|
||||
@ -45,7 +45,6 @@
|
||||
|
||||
#define MAX_HEADER_SIZE 6 /* enough for PES header + length */
|
||||
#define MAX_CHECK_SIZE 65535
|
||||
#define TS_MAX_PROBE_SIZE 2000000 /* do not forget to change this in cfg-common-opts.h, too */
|
||||
#define NUM_CONSECUTIVE_TS_PACKETS 32
|
||||
#define NUM_CONSECUTIVE_AUDIO_PACKETS 348
|
||||
#define MAX_A52_FRAME_SIZE 3840
|
||||
|
||||
@ -21,6 +21,8 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#define TS_MAX_PROBE_SIZE 2000000
|
||||
|
||||
int mp_a52_framesize(uint8_t *buf, int *srate);
|
||||
|
||||
#endif /* MPLAYER_DEMUX_TS_H */
|
||||
|
||||
@ -1060,7 +1060,9 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y,
|
||||
XSelectInput(mDisplay, x11->window, StructureNotifyMask);
|
||||
hint.x = x; hint.y = y;
|
||||
hint.width = width; hint.height = height;
|
||||
hint.flags = PPosition | PSize;
|
||||
hint.flags = PSize;
|
||||
if (geometry_xy_changed)
|
||||
hint.flags |= PPosition;
|
||||
XSetStandardProperties(mDisplay, x11->window, title, title, None, NULL, 0, &hint);
|
||||
if (!vo_border) vo_x11_decoration(vo, 0);
|
||||
// map window
|
||||
@ -1077,6 +1079,8 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y,
|
||||
ButtonPressMask | ButtonReleaseMask | ExposureMask);
|
||||
}
|
||||
if (opts->vo_ontop) vo_x11_setlayer(vo, x11->window, opts->vo_ontop);
|
||||
if (!geometry_xy_changed)
|
||||
vo_x11_update_geometry(vo);
|
||||
vo_x11_nofs_sizepos(vo, vo->dx, vo->dy, width, height);
|
||||
if (!!vo_fs != !!(flags & VOFLAG_FULLSCREEN))
|
||||
vo_x11_fullscreen(vo);
|
||||
|
||||
@ -61,6 +61,7 @@ char *network_password=NULL;
|
||||
int network_bandwidth=0;
|
||||
int network_cookies_enabled = 0;
|
||||
char *network_useragent=NULL;
|
||||
char *network_referrer=NULL;
|
||||
|
||||
/* IPv6 options */
|
||||
int network_ipv4_only_proxy = 0;
|
||||
@ -225,6 +226,23 @@ http_send_request( URL_t *url, off_t pos ) {
|
||||
else
|
||||
http_set_field( http_hdr, "User-Agent: MPlayer/"VERSION);
|
||||
|
||||
if (network_referrer) {
|
||||
char *referrer = NULL;
|
||||
size_t len = strlen(network_referrer) + 10;
|
||||
|
||||
// Check len to ensure we don't do something really bad in case of an overflow
|
||||
if (len > 10)
|
||||
referrer = malloc(len);
|
||||
|
||||
if (referrer == NULL) {
|
||||
mp_tmsg(MSGT_NETWORK, MSGL_FATAL, "Memory allocation failed.\n");
|
||||
} else {
|
||||
snprintf(referrer, len, "Referer: %s", network_referrer);
|
||||
http_set_field(http_hdr, referrer);
|
||||
free(referrer);
|
||||
}
|
||||
}
|
||||
|
||||
if( strcasecmp(url->protocol, "noicyx") )
|
||||
http_set_field(http_hdr, "Icy-MetaData: 1");
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user