diff options
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 22 | ||||
| -rw-r--r-- | DOCS/man/fr/mplayer.1 | 2 | ||||
| -rw-r--r-- | DOCS/tech/libmpcodecs.txt | 22 |
3 files changed, 28 insertions, 18 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 0906523e28..8a3ac1e5a8 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -865,10 +865,12 @@ Enqueue files given on the command line in the playlist instead of playing them immediately. . .TP -.B \-fixed\-vo -Enforces a fixed video system for multiple files (one (un)initialization for -all files). +.B \-nofixed\-vo +\-fixed\-vo enforces a fixed video system for multiple files (one +(un)initialization for all files). Therefore only one window will be opened for all files. +Now enabled by default, use \-nofixed\-vo to disable and create a new window +whenever the video stream changes. Currently the following drivers are fixed-vo compliant: gl, gl2, mga, svga, x11, xmga, xv, xvidix and dfbmga. . @@ -1069,6 +1071,11 @@ Turns off LIRC support. .B \-nomouseinput Disable mouse button press/\:release input (mozplayerxp's context menu relies on this option). +.TP +.B \-noorderedchapters +Disable support for Matroska ordered chapters. +MPlayer will not load or search for video segments from other files, +and will also ignore any chapter order specified for the main file. . .TP .B \-rtc (RTC only) @@ -3055,6 +3062,13 @@ VESA framebuffer does not support mode changing. Override framebuffer mode configuration file (default: /etc/\:fb.modes). . .TP +.B \-force\-window\-position +Forcefully move MPlayer's video output window to default location whenever +there is a change in video parameters, video stream or file. +This used to be the default behavior. +Currently only affects X11 VOs. +. +.TP .B \-fs (also see \-zoom) Fullscreen playback (centers movie, and paints black bands around it). Not supported by all video output drivers. @@ -4321,8 +4335,6 @@ Each file takes the frame number padded with leading zeros as name. .IPs z=<0\-9> Specifies the compression level. 0 is no compression, 9 is maximum compression. -.IPs outdir=<dirname> -Specify the directory to save the PNG files to (default: ./). .IPs alpha (default: noalpha) Create PNG files with an alpha channel. Note that MPlayer in general does not support alpha, so this will only diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 55a88f45c9..a5148bb8fe 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -4570,8 +4570,6 @@ Ne gère que les formats RGB et BGR 24 bits/pixel. .IPs z=<0\-9> Définit le taux de compression. 0 équivaut à pas de compression et 9 à la compression maximale. -.IPs outdir=<chemin> -Définit le répertoire où sauver les fichiers PNG (par défaut\ ./). .IPs alpha (par défaut\ : noalpha) Crée un fichier PNG avec un canal alpha. Notez que MPlayer ne gère en général pas les canaux alpha, donc cette diff --git a/DOCS/tech/libmpcodecs.txt b/DOCS/tech/libmpcodecs.txt index 22d29aaf98..5015f5dcc0 100644 --- a/DOCS/tech/libmpcodecs.txt +++ b/DOCS/tech/libmpcodecs.txt @@ -153,7 +153,7 @@ vf_info_t* info; const char *name; // short name of the filter, must be FILTERNAME const char *author; // name and email/URL of the author(s) const char *comment; // comment, URL to papers describing algorithm etc. - int (*open)(struct vf_instance_s* vf,char* args); + int (*open)(struct vf_instance* vf,char* args); // pointer to the open() function: Sample: @@ -197,13 +197,13 @@ static int open(vf_instance_t *vf, char* args) return 1; } -Functions in vf_instance_s: +Functions in vf_instance: NOTE: All these are optional, their function pointer is either NULL or points to a default implementation. If you implement them, don't forget to set vf->FUNCNAME in your open() ! - int (*query_format)(struct vf_instance_s* vf, unsigned int fmt); + int (*query_format)(struct vf_instance* vf, unsigned int fmt); The query_format() function is called one or more times before the config(), to find out the capabilities and/or support status of a given colorspace (fmt). @@ -216,7 +216,7 @@ next filter will accept at least one of your possible output colorspaces! Sample: -static int query_format(struct vf_instance_s* vf, unsigned int fmt) +static int query_format(struct vf_instance* vf, unsigned int fmt) { switch(fmt){ case IMGFMT_YV12: @@ -232,7 +232,7 @@ For the more complex case, when you have an N -> M colorspace mapping matrix, see vf_scale or vf_rgb2bgr for examples. - int (*config)(struct vf_instance_s* vf, + int (*config)(struct vf_instance* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt); @@ -257,7 +257,7 @@ Its parameters are already well-known from libvo: Sample: -static int config(struct vf_instance_s* vf, +static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { @@ -272,12 +272,12 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,outfmt); } - void (*uninit)(struct vf_instance_s* vf); + void (*uninit)(struct vf_instance* vf); Okay, uninit() is the simplest, it's called at the end. You can free your private buffers etc here. - int (*put_image)(struct vf_instance_s* vf, mp_image_t *mpi); + int (*put_image)(struct vf_instance* vf, mp_image_t *mpi); Ah, put_image(). This is the main filter function, it should convert/filter/ transform the image data from one format/size/color/whatever to another. @@ -332,7 +332,7 @@ image: Ok, the rest is for advanced functionality only: - int (*control)(struct vf_instance_s* vf, int request, void* data); + int (*control)(struct vf_instance* vf, int request, void* data); You can control the filter at runtime from MPlayer/MEncoder/dec_video: #define VFCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */ @@ -343,7 +343,7 @@ You can control the filter at runtime from MPlayer/MEncoder/dec_video: #define VFCTRL_CHANGE_RECTANGLE 9 /* Change the rectangle boundaries */ - void (*get_image)(struct vf_instance_s* vf, mp_image_t *mpi); + void (*get_image)(struct vf_instance* vf, mp_image_t *mpi); This is for direct rendering support, works the same way as in libvo drivers. It makes in-place pixel modifications possible. @@ -359,7 +359,7 @@ order, while put_image is called for display) so the only safe place to save it is in the mpi struct itself: mpi->priv=(void*)dmpi; - void (*draw_slice)(struct vf_instance_s* vf, unsigned char** src, + void (*draw_slice)(struct vf_instance* vf, unsigned char** src, int* stride, int w,int h, int x, int y); It's the good old draw_slice callback, already known from libvo. |