From a98091b77bb193224fff698abc7c41102d7ca7c3 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 17 Nov 2009 13:56:34 +0000 Subject: Use avcodec_align_dimensions to appropriately align width and height in get_buffer instead of reimplementing it badly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29921 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 33b85dc232..96cec39115 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -536,10 +536,8 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ int type= MP_IMGTYPE_IPB; int width= avctx->width; int height= avctx->height; - int align=15; + avcodec_align_dimensions(avctx, &width, &height); //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); - if(avctx->pix_fmt == PIX_FMT_YUV410P) - align=63; //yes seriously, its really needed (16x16 chroma blocks in SVQ1 -> 64x64) if (pic->buffer_hints) { mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints); @@ -595,8 +593,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type== MP_IMGTYPE_IPB ? "using IPB\n" : "using IP\n"); } - mpi= mpcodecs_get_image(sh, type, flags, - (width+align)&(~align), (height+align)&(~align)); + mpi= mpcodecs_get_image(sh, type, flags, width, height); if (!mpi) return -1; // ok, let's see what did we get: -- cgit v1.2.3 From 8a6fdd634d620356ab51a4ecb1590217ad4f23f6 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 21 Nov 2009 18:45:41 +0000 Subject: Add a define for IMGFMT_RGB48NE that depends on machine endianness. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29941 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/img_format.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libmpcodecs') diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 94ab281262..4c917b01e4 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -34,11 +34,13 @@ #define IMGFMT_BGRA (IMGFMT_RGB32|64) #define IMGFMT_ARGB IMGFMT_BGR32 #define IMGFMT_RGBA (IMGFMT_BGR32|64) +#define IMGFMT_RGB48NE IMGFMT_RGB48BE #else #define IMGFMT_ABGR (IMGFMT_BGR32|64) #define IMGFMT_BGRA IMGFMT_BGR32 #define IMGFMT_ARGB (IMGFMT_RGB32|64) #define IMGFMT_RGBA IMGFMT_RGB32 +#define IMGFMT_RGB48NE IMGFMT_RGB48LE #endif /* old names for compatibility */ -- cgit v1.2.3 From 6fa77ca503a5fa4b4a47c232a9459bc4a931c110 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 21 Nov 2009 18:58:03 +0000 Subject: Allow vf_scale to output to RGB48, though still prefer the 24 and 32 bit formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29943 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_scale.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index f2c71ed948..d14b57a26a 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -68,6 +68,8 @@ static unsigned int outfmt_list[]={ IMGFMT_RGB32, IMGFMT_BGR24, IMGFMT_RGB24, + IMGFMT_RGB48LE, + IMGFMT_RGB48BE, IMGFMT_BGR16, IMGFMT_RGB16, IMGFMT_BGR15, -- cgit v1.2.3 From 4198e9d45b98c7657cbddfdb74f5647e0e6c21de Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 21 Nov 2009 19:50:33 +0000 Subject: Remove unreachable parsing code: for filters that use the option parser, the args argument to open will always be NULL and vf->priv will always be != NULL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29945 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_crop.c | 13 ------------- libmpcodecs/vf_delogo.c | 14 -------------- libmpcodecs/vf_eq.c | 6 ------ libmpcodecs/vf_format.c | 39 --------------------------------------- libmpcodecs/vf_hue.c | 5 ----- libmpcodecs/vf_noformat.c | 39 --------------------------------------- libmpcodecs/vf_scale.c | 19 ------------------- 7 files changed, 135 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vf_crop.c b/libmpcodecs/vf_crop.c index 5916f611e0..0fc1ac3c28 100644 --- a/libmpcodecs/vf_crop.c +++ b/libmpcodecs/vf_crop.c @@ -144,19 +144,6 @@ static int open(vf_instance_t *vf, char* args){ vf->start_slice=start_slice; vf->draw_slice=draw_slice; vf->default_reqs=VFCAP_ACCEPT_STRIDE; - if(!vf->priv) { - vf->priv=malloc(sizeof(struct vf_priv_s)); - // TODO: parse args -> - vf->priv->crop_x= - vf->priv->crop_y= - vf->priv->crop_w= - vf->priv->crop_h=-1; - } //if(!vf->priv) - if(args) sscanf(args, "%d:%d:%d:%d", - &vf->priv->crop_w, - &vf->priv->crop_h, - &vf->priv->crop_x, - &vf->priv->crop_y); mp_msg(MSGT_VFILTER, MSGL_INFO, "Crop: %d x %d, %d ; %d\n", vf->priv->crop_w, vf->priv->crop_h, diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c index 7654b627de..c7252d2a26 100644 --- a/libmpcodecs/vf_delogo.c +++ b/libmpcodecs/vf_delogo.c @@ -204,20 +204,6 @@ static int open(vf_instance_t *vf, char* args){ vf->get_image=get_image; vf->query_format=query_format; vf->uninit=uninit; - if (!vf->priv) - { - vf->priv=malloc(sizeof(struct vf_priv_s)); - memset(vf->priv, 0, sizeof(struct vf_priv_s)); - } - - if (args) res = sscanf(args, "%d:%d:%d:%d:%d", - &vf->priv->xoff, &vf->priv->yoff, - &vf->priv->lw, &vf->priv->lh, - &vf->priv->band); - if (args && (res != 5)) { - uninit(vf); - return 0; // bad syntax - } mp_msg(MSGT_VFILTER, MSGL_V, "delogo: %d x %d, %d x %d, band = %d\n", vf->priv->xoff, vf->priv->yoff, diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c index e85deeacff..5e8c3b0e83 100644 --- a/libmpcodecs/vf_eq.c +++ b/libmpcodecs/vf_eq.c @@ -208,12 +208,6 @@ static int open(vf_instance_t *vf, char* args) vf->put_image=put_image; vf->uninit=uninit; - if(!vf->priv) { - vf->priv = malloc(sizeof(struct vf_priv_s)); - memset(vf->priv, 0, sizeof(struct vf_priv_s)); - } - if (args) sscanf(args, "%d:%d", &vf->priv->brightness, &vf->priv->contrast); - process = process_C; #if HAVE_MMX if(gCpuCaps.hasMMX) process = process_MMX; diff --git a/libmpcodecs/vf_format.c b/libmpcodecs/vf_format.c index d97db98a9b..52f66a6c3a 100644 --- a/libmpcodecs/vf_format.c +++ b/libmpcodecs/vf_format.c @@ -31,45 +31,6 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ static int open(vf_instance_t *vf, char* args){ vf->query_format=query_format; vf->default_caps=0; - if(!vf->priv) { - vf->priv=malloc(sizeof(struct vf_priv_s)); - vf->priv->fmt=IMGFMT_YUY2; - } - if(args){ - if(!strcasecmp(args,"444p")) vf->priv->fmt=IMGFMT_444P; else - if(!strcasecmp(args,"422p")) vf->priv->fmt=IMGFMT_422P; else - if(!strcasecmp(args,"411p")) vf->priv->fmt=IMGFMT_411P; else - if(!strcasecmp(args,"yuy2")) vf->priv->fmt=IMGFMT_YUY2; else - if(!strcasecmp(args,"yv12")) vf->priv->fmt=IMGFMT_YV12; else - if(!strcasecmp(args,"i420")) vf->priv->fmt=IMGFMT_I420; else - if(!strcasecmp(args,"yvu9")) vf->priv->fmt=IMGFMT_YVU9; else - if(!strcasecmp(args,"if09")) vf->priv->fmt=IMGFMT_IF09; else - if(!strcasecmp(args,"iyuv")) vf->priv->fmt=IMGFMT_IYUV; else - if(!strcasecmp(args,"uyvy")) vf->priv->fmt=IMGFMT_UYVY; else - if(!strcasecmp(args,"bgr24")) vf->priv->fmt=IMGFMT_BGR24; else - if(!strcasecmp(args,"bgr32")) vf->priv->fmt=IMGFMT_BGR32; else - if(!strcasecmp(args,"bgr16")) vf->priv->fmt=IMGFMT_BGR16; else - if(!strcasecmp(args,"bgr15")) vf->priv->fmt=IMGFMT_BGR15; else - if(!strcasecmp(args,"bgr8")) vf->priv->fmt=IMGFMT_BGR8; else - if(!strcasecmp(args,"bgr4")) vf->priv->fmt=IMGFMT_BGR4; else - if(!strcasecmp(args,"bg4b")) vf->priv->fmt=IMGFMT_BG4B; else - if(!strcasecmp(args,"bgr1")) vf->priv->fmt=IMGFMT_BGR1; else - if(!strcasecmp(args,"rgb24")) vf->priv->fmt=IMGFMT_RGB24; else - if(!strcasecmp(args,"rgb32")) vf->priv->fmt=IMGFMT_RGB32; else - if(!strcasecmp(args,"rgb16")) vf->priv->fmt=IMGFMT_RGB16; else - if(!strcasecmp(args,"rgb15")) vf->priv->fmt=IMGFMT_RGB15; else - if(!strcasecmp(args,"rgb8")) vf->priv->fmt=IMGFMT_RGB8; else - if(!strcasecmp(args,"rgb4")) vf->priv->fmt=IMGFMT_RGB4; else - if(!strcasecmp(args,"rg4b")) vf->priv->fmt=IMGFMT_RG4B; else - if(!strcasecmp(args,"rgb1")) vf->priv->fmt=IMGFMT_RGB1; else - if(!strcasecmp(args,"rgba")) vf->priv->fmt=IMGFMT_RGBA; else - if(!strcasecmp(args,"argb")) vf->priv->fmt=IMGFMT_ARGB; else - if(!strcasecmp(args,"bgra")) vf->priv->fmt=IMGFMT_BGRA; else - if(!strcasecmp(args,"abgr")) vf->priv->fmt=IMGFMT_ABGR; else - { mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_UnknownFormatName, args);return 0;} - } - - return 1; } diff --git a/libmpcodecs/vf_hue.c b/libmpcodecs/vf_hue.c index 89ed3ee243..ec74c52632 100644 --- a/libmpcodecs/vf_hue.c +++ b/libmpcodecs/vf_hue.c @@ -152,11 +152,6 @@ static int open(vf_instance_t *vf, char* args) vf->put_image=put_image; vf->uninit=uninit; - if(!vf->priv) { - vf->priv = malloc(sizeof(struct vf_priv_s)); - memset(vf->priv, 0, sizeof(struct vf_priv_s)); - } - if (args) sscanf(args, "%f:%f", &vf->priv->hue, &vf->priv->saturation); vf->priv->hue *= M_PI / 180.0; process = process_C; diff --git a/libmpcodecs/vf_noformat.c b/libmpcodecs/vf_noformat.c index 1938da10cc..2ca91c0566 100644 --- a/libmpcodecs/vf_noformat.c +++ b/libmpcodecs/vf_noformat.c @@ -31,45 +31,6 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ static int open(vf_instance_t *vf, char* args){ vf->query_format=query_format; vf->default_caps=0; - if(!vf->priv) { - vf->priv=malloc(sizeof(struct vf_priv_s)); - vf->priv->fmt=IMGFMT_YV12; - } - if(args){ - if(!strcasecmp(args,"444p")) vf->priv->fmt=IMGFMT_444P; else - if(!strcasecmp(args,"422p")) vf->priv->fmt=IMGFMT_422P; else - if(!strcasecmp(args,"411p")) vf->priv->fmt=IMGFMT_411P; else - if(!strcasecmp(args,"yuy2")) vf->priv->fmt=IMGFMT_YUY2; else - if(!strcasecmp(args,"yv12")) vf->priv->fmt=IMGFMT_YV12; else - if(!strcasecmp(args,"i420")) vf->priv->fmt=IMGFMT_I420; else - if(!strcasecmp(args,"yvu9")) vf->priv->fmt=IMGFMT_YVU9; else - if(!strcasecmp(args,"if09")) vf->priv->fmt=IMGFMT_IF09; else - if(!strcasecmp(args,"iyuv")) vf->priv->fmt=IMGFMT_IYUV; else - if(!strcasecmp(args,"uyvy")) vf->priv->fmt=IMGFMT_UYVY; else - if(!strcasecmp(args,"bgr24")) vf->priv->fmt=IMGFMT_BGR24; else - if(!strcasecmp(args,"bgr32")) vf->priv->fmt=IMGFMT_BGR32; else - if(!strcasecmp(args,"bgr16")) vf->priv->fmt=IMGFMT_BGR16; else - if(!strcasecmp(args,"bgr15")) vf->priv->fmt=IMGFMT_BGR15; else - if(!strcasecmp(args,"bgr8")) vf->priv->fmt=IMGFMT_BGR8; else - if(!strcasecmp(args,"bgr4")) vf->priv->fmt=IMGFMT_BGR4; else - if(!strcasecmp(args,"bg4b")) vf->priv->fmt=IMGFMT_BG4B; else - if(!strcasecmp(args,"bgr1")) vf->priv->fmt=IMGFMT_BGR1; else - if(!strcasecmp(args,"rgb24")) vf->priv->fmt=IMGFMT_RGB24; else - if(!strcasecmp(args,"rgb32")) vf->priv->fmt=IMGFMT_RGB32; else - if(!strcasecmp(args,"rgb16")) vf->priv->fmt=IMGFMT_RGB16; else - if(!strcasecmp(args,"rgb15")) vf->priv->fmt=IMGFMT_RGB15; else - if(!strcasecmp(args,"rgb8")) vf->priv->fmt=IMGFMT_RGB8; else - if(!strcasecmp(args,"rgb4")) vf->priv->fmt=IMGFMT_RGB4; else - if(!strcasecmp(args,"rg4b")) vf->priv->fmt=IMGFMT_RG4B; else - if(!strcasecmp(args,"rgb1")) vf->priv->fmt=IMGFMT_RGB1; else - if(!strcasecmp(args,"rgba")) vf->priv->fmt=IMGFMT_RGBA; else - if(!strcasecmp(args,"argb")) vf->priv->fmt=IMGFMT_ARGB; else - if(!strcasecmp(args,"bgra")) vf->priv->fmt=IMGFMT_BGRA; else - if(!strcasecmp(args,"abgr")) vf->priv->fmt=IMGFMT_ABGR; else - { mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_UnknownFormatName, args);return 0;} - } - - return 1; } diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index d14b57a26a..a18b0ebe7e 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -508,25 +508,6 @@ static int open(vf_instance_t *vf, char* args){ vf->query_format=query_format; vf->control= control; vf->uninit=uninit; - if(!vf->priv) { - 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; - vf->priv->accurate_rnd=0; - vf->priv->param[0]= - vf->priv->param[1]=SWS_PARAM_DEFAULT; - vf->priv->palette=NULL; - } // if(!vf->priv) - if(args) sscanf(args, "%d:%d:%d:%lf:%lf", - &vf->priv->w, - &vf->priv->h, - &vf->priv->v_chr_drop, - &vf->priv->param[0], - &vf->priv->param[1]); mp_msg(MSGT_VFILTER,MSGL_V,"SwScale params: %d x %d (-1=no scaling)\n", vf->priv->w, vf->priv->h); -- cgit v1.2.3 From 65c2bae2b542a5157481ea8ca037da0583d85d50 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 22 Nov 2009 13:08:43 +0000 Subject: Remove unused variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29954 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_ffmpeg.c | 1 - 1 file changed, 1 deletion(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index bbaa316b4f..64b5e1a29a 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -179,7 +179,6 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m if (((AVCodecContext *)sh_audio->context)->channels >= 5) { int samplesize = av_get_bits_per_sample_format(((AVCodecContext *) sh_audio->context)->sample_fmt) / 8; - const char *codec=((AVCodecContext*)sh_audio->context)->codec->name; reorder_channel_nch(buf, AF_CHANNEL_LAYOUT_LAVC_DEFAULT, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, ((AVCodecContext *)sh_audio->context)->channels, -- cgit v1.2.3 From dcd0dacccaa18af16e33d03d51062bef5eade67f Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 22 Nov 2009 13:14:39 +0000 Subject: Switch ad_ffmpeg to avcodec_decode_audio3 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29955 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_ffmpeg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 64b5e1a29a..4d091dd694 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -163,15 +163,19 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m unsigned char *start=NULL; int y,len=-1; while(lends,&start, &pts); if(x<=0) break; // error + av_init_packet(&pkt); + pkt.data = start; + pkt.size = x; if (pts != MP_NOPTS_VALUE) { sh_audio->pts = pts; sh_audio->pts_bytes = 0; } - y=avcodec_decode_audio2(sh_audio->context,(int16_t*)buf,&len2,start,x); + y=avcodec_decode_audio3(sh_audio->context,(int16_t*)buf,&len2,&pkt); //printf("return:%d samples_out:%d bitstream_in:%d sample_sum:%d\n", y, len2, x, len); fflush(stdout); if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } if(yds->buffer_pos+=y-x; // put back data (HACK!) -- cgit v1.2.3 From 2959f9e0327b12e14537c5211f71e087e29d2ff2 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 22 Nov 2009 13:18:12 +0000 Subject: Add const to draw_slice argument to match what FFmpeg expects for draw_horiz_band. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29956 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 96cec39115..e8ad07b33f 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -55,7 +55,7 @@ typedef struct { static int get_buffer(AVCodecContext *avctx, AVFrame *pic); static void release_buffer(AVCodecContext *avctx, AVFrame *pic); -static void draw_slice(struct AVCodecContext *s, AVFrame *src, int offset[4], +static void draw_slice(struct AVCodecContext *s, const AVFrame *src, int offset[4], int y, int type, int height); static enum PixelFormat get_format(struct AVCodecContext *avctx, @@ -451,7 +451,7 @@ static void uninit(sh_video_t *sh){ } static void draw_slice(struct AVCodecContext *s, - AVFrame *src, int offset[4], + const AVFrame *src, int offset[4], int y, int type, int height){ sh_video_t *sh = s->opaque; uint8_t *source[MP_MAX_PLANES]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2]}; -- cgit v1.2.3 From 86e0273c140544fc474ed923c54f31a440c7f1d1 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 22 Nov 2009 13:25:07 +0000 Subject: Remove unused variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29957 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_delogo.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c index c7252d2a26..b07fd4017e 100644 --- a/libmpcodecs/vf_delogo.c +++ b/libmpcodecs/vf_delogo.c @@ -197,8 +197,6 @@ static unsigned int fmt_list[]={ }; static int open(vf_instance_t *vf, char* args){ - int res; - vf->config=config; vf->put_image=put_image; vf->get_image=get_image; -- cgit v1.2.3 From b01af7a4286cc52d04e486b31bdd3a5b49af8ebd Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 22 Nov 2009 13:26:57 +0000 Subject: Fix initialization values for vf_expand priv struct. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29958 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vf_expand.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c index bc3fb9c57d..d68de2f4e4 100644 --- a/libmpcodecs/vf_expand.c +++ b/libmpcodecs/vf_expand.c @@ -40,6 +40,8 @@ static struct vf_priv_s { int passthrough; int first_slice; } const vf_priv_dflt = { + -1,-1, + -1,-1, -1,-1, -1,-1, 0, -- cgit v1.2.3