RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge svn changes up to r31332

This commit is contained in:
Uoti Urpala 2010-06-05 23:37:42 +03:00
parent b6db356750 601d6af3ec
commit 8362ad36ac
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DOCS/man/en/mplayer.1
View File

@ -6106,7 +6106,7 @@ Also perform R <\-> B swapping.
RGB/BGR 8 \-> 15/16/24/32bpp colorspace conversion using palette. RGB/BGR 8 \-> 15/16/24/32bpp colorspace conversion using palette.
. .
.TP .TP
.B format[=fourcc] .B format[=fourcc[:outfourcc]]
Restricts the colorspace for the next filter without doing any conversion. Restricts the colorspace for the next filter without doing any conversion.
Use together with the scale filter for a real conversion. Use together with the scale filter for a real conversion.
.br .br
@ -6116,6 +6116,17 @@ For a list of available formats see format=fmt=help.
.RSs .RSs
.IPs <fourcc> .IPs <fourcc>
format name like rgb15, bgr24, yv12, etc (default: yuy2) format name like rgb15, bgr24, yv12, etc (default: yuy2)
.IPs <outfourcc>
Format name that should be substituted for the output.
If this is not 100% compatible with the <fourcc> value it will crash.
.br
Valid examples:
.br
format=rgb24:bgr24 format=yuyv:yuy2
.br
Invalid examples (will crash):
.br
format=rgb24:yv12
.RE .RE
.PD 1 .PD 1
. .

2
etc/codecs.conf
View File

@ -3,7 +3,7 @@
; Before editing this file, please read DOCS/tech/codecs.conf.txt ! ; Before editing this file, please read DOCS/tech/codecs.conf.txt !
;============================================================================= ;=============================================================================
release 20090308 release 20100605
;============================================================================= ;=============================================================================
; VIDEO CODECS ; VIDEO CODECS

19
libmpcodecs/vf_format.c
View File

@ -33,27 +33,42 @@
static struct vf_priv_s { static struct vf_priv_s {
unsigned int fmt; unsigned int fmt;
unsigned int outfmt;
} const vf_priv_dflt = { } const vf_priv_dflt = {
IMGFMT_YUY2 IMGFMT_YUY2,
0
}; };
//===========================================================================// //===========================================================================//
static int query_format(struct vf_instance *vf, unsigned int fmt){ static int query_format(struct vf_instance *vf, unsigned int fmt){
if(fmt==vf->priv->fmt) if(fmt==vf->priv->fmt) {
if (vf->priv->outfmt)
fmt = vf->priv->outfmt;
return vf_next_query_format(vf,fmt); return vf_next_query_format(vf,fmt);
}
return 0; return 0;
} }
static int config(struct vf_instance *vf, int width, int height,
int d_width, int d_height,
unsigned flags, unsigned outfmt){
return vf_next_config(vf, width, height, d_width, d_height, flags, vf->priv->outfmt);
}
static int vf_open(vf_instance_t *vf, char *args){ static int vf_open(vf_instance_t *vf, char *args){
vf->query_format=query_format; vf->query_format=query_format;
vf->draw_slice=vf_next_draw_slice;
vf->default_caps=0; vf->default_caps=0;
if (vf->priv->outfmt)
vf->config=config;
return 1; return 1;
} }
#define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f) #define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f)
static const m_option_t vf_opts_fields[] = { static const m_option_t vf_opts_fields[] = {
{"fmt", ST_OFF(fmt), CONF_TYPE_IMGFMT, 0,0 ,0, NULL}, {"fmt", ST_OFF(fmt), CONF_TYPE_IMGFMT, 0,0 ,0, NULL},
{"outfmt", ST_OFF(outfmt), CONF_TYPE_IMGFMT, 0,0 ,0, NULL},
{ NULL, NULL, 0, 0, 0, 0, NULL } { NULL, NULL, 0, 0, 0, 0, NULL }
}; };

1
libmpcodecs/vf_noformat.c
View File

@ -47,6 +47,7 @@ static int query_format(struct vf_instance *vf, unsigned int fmt){
static int vf_open(vf_instance_t *vf, char *args){ static int vf_open(vf_instance_t *vf, char *args){
vf->query_format=query_format; vf->query_format=query_format;
vf->draw_slice=vf_next_draw_slice;
vf->default_caps=0; vf->default_caps=0;
return 1; return 1;
} }