December 2003 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main configure,1.810,1.811
by Gabucino 30 Jan '04

30 Jan '04

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv22838 Modified Files: configure Log Message: missing clause Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.810 retrieving revision 1.811 diff -u -r1.810 -r1.811 --- configure 13 Nov 2003 20:52:41 -0000 1.810 +++ configure 13 Nov 2003 21:03:11 -0000 1.811 @@ -2107,7 +2107,7 @@ _inttypes=no cc_check && _inttypes=yes if test "$_inttypes" = yes ; then - die "you don't have inttypes.h, but sys/bitypes.h is present. Please copy etc/inttypes.h.link into the include path, and re-run configure." + die "you don't have inttypes.h, but sys/bitypes.h is present. Please copy etc/inttypes.h.link into the include path, rename it to inttypes.h and re-run configure." else die "cannot find header either inttypes.h or bitypes.h (see DOCS/HTML/en/faq.html)" fi

2 8

CVS: main/osdep lrmi.c,1.5,1.6 lrmi.h,1.1,1.2
by diego＠mplayerhq.hu 16 Jan '04

16 Jan '04

Update of /cvsroot/mplayer/main/osdep In directory mail:/tmp/cvs-serv31568/osdep Modified Files: lrmi.c lrmi.h Log Message: Dead URL removed, modification statement added. Index: lrmi.c =================================================================== RCS file: /cvsroot/mplayer/main/osdep/lrmi.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lrmi.c 24 Nov 2003 22:39:03 -0000 1.5 +++ lrmi.c 31 Dec 2003 21:40:56 -0000 1.6 @@ -8,7 +8,8 @@ versions as being modified. This software has NO WARRANTY. Use it at your own risk. -Original location: http://cvs.debian.org/lrmi/ + +Modified for use with MPlayer, see the CVS log for details. */ #include "../config.h" Index: lrmi.h =================================================================== RCS file: /cvsroot/mplayer/main/osdep/lrmi.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lrmi.h 15 Oct 2001 16:59:35 -0000 1.1 +++ lrmi.h 31 Dec 2003 21:40:56 -0000 1.2 @@ -8,7 +8,6 @@ versions as being modified. This software has NO WARRANTY. Use it at your own risk. -Original location: http://cvs.debian.org/lrmi/ */ #ifndef LRMI_H

4 3

CVS: main/libvo vo_xv.c,1.144,1.145
by Attila Kinali CVS 12 Jan '04

12 Jan '04

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv22550 Modified Files: vo_xv.c Log Message: add port parameter to -vo xv based on patch from Jean-Yves Simon <lethalwp(a)tiscali.be> Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- vo_xv.c 31 Aug 2003 22:27:10 -0000 1.144 +++ vo_xv.c 6 Sep 2003 13:40:00 -0000 1.145 @@ -593,14 +593,22 @@ XvPortID xv_p; int busy_ports=0; + xv_port = 0; + if(arg) { - mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg); - return ENOSYS; + if ((strlen(arg) >= 6) && !strncmp(arg, "port=", 5)) + { + xv_port = atoi(arg+5); + } + else + { + mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg); + return ENOSYS; + } } if (!vo_init()) return -1; - xv_port = 0; /* check for Xvideo extension */ if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){ mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n"); @@ -610,11 +618,22 @@ /* check for Xvideo support */ if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){ - mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed"); + mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed\n"); return -1; } /* check adaptors */ + if(xv_port >= adaptors) + { + mp_msg(MSGT_VO, MSGL_WARN,"Xv: Invalid port parameter, overriding with port 0\n"); + xv_port = 0; + } + if (xv_port) + { + if (XvGrabPort(mDisplay, xv_port, CurrentTime)) + xv_port = 0; + } + for (i = 0; i < adaptors && xv_port == 0; i++){ if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) { for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p)

4 3

CVS: main/libmpcodecs ad_flac.c,1.2,1.3
by lumag＠mplayerhq.hu 05 Jan '04

05 Jan '04

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/tmp/cvs-serv463/libmpcodecs Modified Files: ad_flac.c Log Message: Sync to original FLAC. Main reason from their CVS log: add support for synthesis to big-endian in plugins. Index: ad_flac.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_flac.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ad_flac.c 16 Nov 2003 10:41:25 -0000 1.2 +++ ad_flac.c 29 Dec 2003 18:10:49 -0000 1.3 @@ -108,32 +108,19 @@ FLAC__StreamDecoderWriteStatus flac_write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) { FLAC__byte *buf = ((flac_struct_t*)(client_data))->buf; - int channel, sample; int bps = ((flac_struct_t*)(client_data))->sh->samplesize; + int lowendian = (((flac_struct_t*)(client_data))->sh->sample_format == AFMT_S16_LE); + int unsigned_data = (((flac_struct_t*)(client_data))->sh->sample_format == AFMT_U8); mp_msg(MSGT_DECAUDIO, MSGL_DBG2, "\nWrite callback (%d bytes)!!!!\n", bps*frame->header.blocksize*frame->header.channels); if (buf == NULL) { /* This is used in control for skipping 1 audio frame */ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } -#if 0 - for (sample = 0; sample < frame->header.blocksize; sample ++) - for (channel = 0; channel < frame->header.channels; channel ++) - switch (bps) - { - case 3: - buf[bps*(sample*frame->header.channels+channel)+2] = (FLAC__byte)(buffer[channel][sample]>>16); - case 2: - buf[bps*(sample*frame->header.channels+channel)+1] = (FLAC__byte)(buffer[channel][sample]>>8); - buf[bps*(sample*frame->header.channels+channel)+0] = (FLAC__byte)(buffer[channel][sample]); - break; - case 1: - buf[bps*(sample*frame->header.channels+channel)] = buffer[channel][sample]^0x80; - break; - } -#else - FLAC__plugin_common__apply_gain( + FLAC__replaygain_synthesis__apply_gain( buf, + lowendian, + unsigned_data, buffer, frame->header.blocksize, frame->header.channels, @@ -144,7 +131,6 @@ dither, &(((flac_struct_t*)(client_data))->dither_context) ); -#endif ((flac_struct_t*)(client_data))->written += bps*frame->header.blocksize*frame->header.channels; return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } @@ -238,7 +224,12 @@ ((flac_struct_t*)client_data)->bits_per_sample = metadata->data.stream_info.bits_per_sample; sh->samplesize = (metadata->data.stream_info.bits_per_sample<=8)?1:2; /* FIXME: need to support dithering to samplesize 4 */ - sh->sample_format=(sh->samplesize==1)?AFMT_U8:AFMT_S16_LE; // sample format, see libao2/afmt.h + sh->sample_format=(sh->samplesize==1)?AFMT_U8: +#ifdef WORDS_BIGENDIAN + AFMT_S16_BE; +#else + AFMT_S16_LE; +#endif sh->o_bps = sh->samplesize * metadata->data.stream_info.channels * metadata->data.stream_info.sample_rate; sh->i_bps = metadata->data.stream_info.bits_per_sample * metadata->data.stream_info.channels * metadata->data.stream_info.sample_rate / 8 / 2; // input data rate (compressed bytes per second) @@ -460,7 +451,7 @@ FLAC__stream_decoder_process_until_end_of_metadata(context->flac_dec); - FLAC__plugin_common__init_dither_context(&(context->dither_context), sh_audio->samplesize * 8, noise_shaping); + FLAC__replaygain_synthesis__init_dither_context(&(context->dither_context), sh_audio->samplesize * 8, noise_shaping); return 1; // return values: 1=OK 0=ERROR }

3 3

CVS: main AUTHORS,1.43,1.44
by diego＠mplayerhq.hu 31 Dec '03

31 Dec '03

Update of /cvsroot/mplayer/main In directory mail:/tmp/cvs-serv24964 Modified Files: AUTHORS Log Message: SCNR ;-) Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/AUTHORS,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- AUTHORS 20 Dec 2003 15:52:30 -0000 1.43 +++ AUTHORS 31 Dec 2003 21:51:56 -0000 1.44 @@ -492,7 +492,7 @@ * various small fixes in the x11 code * xinerama support * documentation - * patch application monkey + * patch application monkey, mailer daemon Andoni Zubimendi <andoni(a)lpsat.net>. * Spanish documentation translation

1 0

CVS: main Copyright,1.3,1.4
by diego＠mplayerhq.hu 31 Dec '03

31 Dec '03

Update of /cvsroot/mplayer/main In directory mail:/tmp/cvs-serv3446 Modified Files: Copyright Log Message: LRMI added. Index: Copyright =================================================================== RCS file: /cvsroot/mplayer/main/Copyright,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Copyright 27 Dec 2003 20:13:30 -0000 1.3 +++ Copyright 31 Dec 2003 21:44:37 -0000 1.4 @@ -62,6 +62,12 @@ Directory: mp3lib License: GNU Lesser General Public License +Name: LRMI - Linux Real Mode Interface +Version: unknown, taken from svgalib +Homepage: http://www.svgalib.org/ +Directory: osdep/lrmi.[ch] +License: permissive, see file header + Name: avifile DLL loader Version: 0.47 + patches + CVS updates Homepage: http://avifile.sourceforge.net/

1 0

CVS: main configure,1.824,1.825
by diego＠mplayerhq.hu 31 Dec '03

31 Dec '03

Update of /cvsroot/mplayer/main In directory mail:/tmp/cvs-serv5344 Modified Files: configure Log Message: MPlayer's configure fails to detect fontconfig on a system with POSIXLY_CORRECT set in the environment. The reason it fails is that it passes the arguments to pkg-config in the wrong order. (When POSIXLY_CORRECT is not set, glibc takes the liberty of rearranging the parameters.) patch by Matthew Fischer <futhark(a)vzavenue.net> Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.824 retrieving revision 1.825 diff -u -r1.824 -r1.825 --- configure 27 Dec 2003 19:27:59 -0000 1.824 +++ configure 31 Dec 2003 21:35:52 -0000 1.825 @@ -4277,7 +4277,7 @@ fi echocheck "fontconfig" if test "$_fontconfig" = auto ; then - if ( pkg-config fontconfig --modversion) > /dev/null 2>&1 ; then + if ( pkg-config --modversion fontconfig) > /dev/null 2>&1 ; then cat > $TMPC << EOF #include <stdio.h> #include <fontconfig/fontconfig.h> @@ -4293,15 +4293,15 @@ } EOF _fontconfig=no - cc_check `pkg-config fontconfig --cflags --libs` && ( $TMPO >> "$TMPLOG" ) && _fontconfig=yes + cc_check `pkg-config --cflags --libs fontconfig` && ( $TMPO >> "$TMPLOG" ) && _fontconfig=yes else _fontconfig=no fi fi if test "$_fontconfig" = yes ; then _def_fontconfig='#define HAVE_FONTCONFIG' - _inc_fontconfig=`pkg-config fontconfig --cflags` - _ld_fontconfig=`pkg-config fontconfig --libs` + _inc_fontconfig=`pkg-config --cflags fontconfig` + _ld_fontconfig=`pkg-config --libs fontconfig` else _def_fontconfig='#undef HAVE_FONTCONFIG' fi

1 0

CVS: main/libdha README,1.4,1.5
by diego＠mplayerhq.hu 31 Dec '03

31 Dec '03

Update of /cvsroot/mplayer/main/libdha In directory mail:/tmp/cvs-serv1078/libdha Modified Files: README Log Message: spelling + grammar Index: README =================================================================== RCS file: /cvsroot/mplayer/main/libdha/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README 21 Dec 2002 18:13:55 -0000 1.4 +++ README 31 Dec 2003 21:33:28 -0000 1.5 @@ -15,9 +15,9 @@ Linux/PPC There are different ways to access the hardware, normally only ROOT can do that. -With root privileges libdha will finely run, but there are some others ways +With root privileges libdha will run fine, but there are some others ways to use it as a normal user: -1, set the SUID bit on the binary (in this way it runs with root priviliges) +1, set the SUID bit on the binary (in this way it runs with root privileges) 2, use svgalib kernel helper 3, use dhahelper (not yet finished)

1 0

CVS: main/libmpcodecs vd_ffmpeg.c, 1.114, 1.115 ve_lavc.c, 1.88, 1.89
by michael＠mplayerhq.hu 30 Dec '03

30 Dec '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/tmp/cvs-serv10171/libmpcodecs Modified Files: vd_ffmpeg.c ve_lavc.c Log Message: vismv, alt, ilme options Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- vd_ffmpeg.c 22 Dec 2003 17:26:19 -0000 1.114 +++ vd_ffmpeg.c 30 Dec 2003 18:24:19 -0000 1.115 @@ -98,6 +98,7 @@ static int lavc_param_vstats=0; static int lavc_param_idct_algo=0; static int lavc_param_debug=0; +static int lavc_param_vismv=0; m_option_t lavc_decode_opts_conf[]={ {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, @@ -106,9 +107,8 @@ {"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, {"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#if LIBAVCODEC_BUILD >= 4642 {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, -#endif + {"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -225,6 +225,9 @@ #if LIBAVCODEC_BUILD >= 4642 avctx->debug= lavc_param_debug; #endif +#if LIBAVCODEC_BUILD >= 4698 + avctx->debug_mv= lavc_param_vismv; +#endif mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height); /* AVRn stores huffman table in AVI header */ /* Pegasus MJPEG stores it also in AVI header, but it uses the common Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- ve_lavc.c 28 Dec 2003 19:36:10 -0000 1.88 +++ ve_lavc.c 30 Dec 2003 18:24:19 -0000 1.89 @@ -142,6 +142,8 @@ static int lavc_param_sc_threshold= 0; static int lavc_param_ss= 0; static int lavc_param_top= -1; +static int lavc_param_alt= 0; +static int lavc_param_ilme= 0; char *lavc_param_acodec = "mp2"; @@ -269,6 +271,12 @@ #ifdef CODEC_FLAG_H263P_SLICE_STRUCT {"ss", &lavc_param_ss, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT, NULL}, #endif +#ifdef CODEC_FLAG_ALT_SCAN + {"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN, NULL}, +#endif +#ifdef CODEC_FLAG_INTERLACED_ME + {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME, NULL}, +#endif {"inter_threshold", &lavc_param_inter_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000, 1000000, NULL}, {"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000, 1000000, NULL}, {"top", &lavc_param_top, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL}, @@ -549,6 +557,8 @@ lavc_venc_context->flags|= lavc_param_mv0; lavc_venc_context->flags|= lavc_param_qp_rd; lavc_venc_context->flags|= lavc_param_ss; + lavc_venc_context->flags|= lavc_param_alt; + lavc_venc_context->flags|= lavc_param_ilme; if(lavc_param_gray) lavc_venc_context->flags|= CODEC_FLAG_GRAY; if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;

1 0

CVS: main/libmpcodecs vf_scale.c,1.49,1.50
by michael＠mplayerhq.hu 29 Dec '03

29 Dec '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/tmp/cvs-serv17839/libmpcodecs Modified Files: vf_scale.c Log Message: interlaced scaling Index: vf_scale.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- vf_scale.c 29 Nov 2003 19:40:30 -0000 1.49 +++ vf_scale.c 29 Dec 2003 14:16:07 -0000 1.50 @@ -24,7 +24,9 @@ int param; unsigned int fmt; struct SwsContext *ctx; + struct SwsContext *ctx2; //for interlaced slices only unsigned char* palette; + int interlaced; int query_format_cache[64]; } vf_priv_dflt = { -1,-1, @@ -32,6 +34,7 @@ 0, 0, NULL, + NULL, NULL }; @@ -177,16 +180,24 @@ // free old ctx: if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); + if(vf->priv->ctx2)sws_freeContext(vf->priv->ctx2); // new swscaler: sws_getFlagsAndFilterFromCmdLine(&int_sws_flags, &srcFilter, &dstFilter); int_sws_flags|= vf->priv->v_chr_drop << SWS_SRC_V_CHR_DROP_SHIFT; int_sws_flags|= vf->priv->param << SWS_PARAM_SHIFT; - vf->priv->ctx=sws_getContext(width,height, + vf->priv->ctx=sws_getContext(width, height >> vf->priv->interlaced, + outfmt, + vf->priv->w, vf->priv->h >> vf->priv->interlaced, + best, + int_sws_flags | get_sws_cpuflags(), srcFilter, dstFilter); + if(vf->priv->interlaced){ + vf->priv->ctx2=sws_getContext(width, height >> 1, outfmt, - vf->priv->w,vf->priv->h, + vf->priv->w, vf->priv->h >> 1, best, int_sws_flags | get_sws_cpuflags(), srcFilter, dstFilter); + } if(!vf->priv->ctx){ // error... mp_msg(MSGT_VFILTER,MSGL_WARN,"Couldn't init SwScaler for this setup\n"); @@ -247,6 +258,26 @@ vf->priv->w, vf->priv->h); } +static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[3], int src_stride[3], int y, int h, + uint8_t *dst[3], int dst_stride[3], int interlaced){ + if(interlaced){ + int i; + uint8_t *src2[3]={src[0], src[1], src[2]}; + uint8_t *dst2[3]={dst[0], dst[1], dst[2]}; + int src_stride2[3]={2*src_stride[0], 2*src_stride[1], 2*src_stride[2]}; + int dst_stride2[3]={2*dst_stride[0], 2*dst_stride[1], 2*dst_stride[2]}; + + sws_scale_ordered(sws1, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2); + for(i=0; i<3; i++){ + src2[i] += src_stride[i]; + dst2[i] += dst_stride[i]; + } + sws_scale_ordered(sws2, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2); + }else{ + sws_scale_ordered(sws1, src, src_stride, y, h, dst, dst_stride); + } +} + static void draw_slice(struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y){ mp_image_t *dmpi=vf->dmpi; @@ -255,7 +286,7 @@ return; } // printf("vf_scale::draw_slice() y=%d h=%d\n",y,h); - sws_scale_ordered(vf->priv->ctx,src,stride,y,h,dmpi->planes,dmpi->stride); + scale(vf->priv->ctx, vf->priv->ctx2, src, stride, y, h, dmpi->planes, dmpi->stride, vf->priv->interlaced); } static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ @@ -270,8 +301,8 @@ dmpi=vf_get_image(vf->next,vf->priv->fmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE, vf->priv->w, vf->priv->h); - sws_scale_ordered(vf->priv->ctx,mpi->planes,mpi->stride,0,mpi->h,dmpi->planes,dmpi->stride); - + + scale(vf->priv->ctx, vf->priv->ctx, mpi->planes,mpi->stride,0,mpi->h,dmpi->planes,dmpi->stride, vf->priv->interlaced); } if(vf->priv->w==mpi->w && vf->priv->h==mpi->h){ @@ -331,6 +362,10 @@ r= sws_setColorspaceDetails(vf->priv->ctx, inv_table, srcRange, table, dstRange, brightness, contrast, saturation); if(r<0) break; + if(vf->priv->ctx2){ + r= sws_setColorspaceDetails(vf->priv->ctx2, inv_table, srcRange, table, dstRange, brightness, contrast, saturation); + if(r<0) break; + } return CONTROL_TRUE; default: @@ -381,6 +416,7 @@ static void uninit(struct vf_instance_s *vf){ if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); + if(vf->priv->ctx2) sws_freeContext(vf->priv->ctx2); if(vf->priv->palette) free(vf->priv->palette); free(vf->priv); } @@ -397,6 +433,7 @@ vf->priv=malloc(sizeof(struct vf_priv_s)); // TODO: parse args -> vf->priv->ctx=NULL; + vf->priv->ctx2=NULL; vf->priv->w= vf->priv->h=-1; vf->priv->v_chr_drop=0; @@ -411,6 +448,7 @@ mp_msg(MSGT_VFILTER,MSGL_V,"SwScale params: %d x %d (-1=no scaling)\n", vf->priv->w, vf->priv->h); + return 1; } @@ -530,6 +568,7 @@ static m_option_t vf_opts_fields[] = { {"w", ST_OFF(w), CONF_TYPE_INT, M_OPT_MIN,-3 ,0, NULL}, {"h", ST_OFF(h), CONF_TYPE_INT, M_OPT_MIN,-3 ,0, NULL}, + {"interlaced", ST_OFF(interlaced), CONF_TYPE_INT, M_OPT_RANGE, 0, 1, NULL}, {"chr-drop", ST_OFF(v_chr_drop), CONF_TYPE_INT, M_OPT_RANGE, 0, 3, NULL}, {"param", ST_OFF(param), CONF_TYPE_INT, M_OPT_RANGE, 0, 100, NULL}, // Note that here the 2 field is NULL (ie 0)

2 1