diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 539a8747f..ab096ed1f 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -509,18 +509,22 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt) sh->disp_h = height; ctx->pix_fmt = pix_fmt; ctx->best_csp = pixfmt2imgfmt(pix_fmt); + const unsigned int *supported_fmts; - if (ctx->best_csp == IMGFMT_YV12) + if(ctx->best_csp == 0) + printf("argh!\n"); + + if (ctx->best_csp == IMGFMT_YV12) { supported_fmts = (const unsigned int[]){ IMGFMT_YV12, IMGFMT_I420, IMGFMT_IYUV, 0xffffffff - }; + }; printf ("yv12\n"); } else if (ctx->best_csp == IMGFMT_422P) supported_fmts = (const unsigned int[]){ IMGFMT_422P, IMGFMT_YV12, IMGFMT_I420, IMGFMT_IYUV, 0xffffffff }; else supported_fmts = (const unsigned int[]){ctx->best_csp, 0xffffffff}; - + sh->color_primaries = avcol_pri_to_mp_cprim(avctx->color_primaries); sh->colorspace = avcol_spc_to_mp_csp(avctx->colorspace); sh->color_range = avcol_range_to_mp_csp_levels(avctx->color_range); diff --git a/libvo/vo_gl3.c b/libvo/vo_gl3.c index b4886a0d2..5ff838a0d 100644 --- a/libvo/vo_gl3.c +++ b/libvo/vo_gl3.c @@ -2567,7 +2567,7 @@ const struct vo_driver video_out_gl3 = { .uninit = uninit, }; -static const char help_text[] = +static const char help_text[8048] = "\n--vo=gl3 command line help:\n" "Example: mplayer --vo=gl3:scale-sep:lscale=lanczos2\n" "\nOptions:\n" diff --git a/mp_msg.c b/mp_msg.c index eea65671d..04edf0575 100644 --- a/mp_msg.c +++ b/mp_msg.c @@ -38,7 +38,7 @@ #include "mp_msg.h" /* maximum message length of mp_msg */ -#define MSGSIZE_MAX 3072 +#define MSGSIZE_MAX 7200 #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN