From cc6431750114dce9ca7191392c98f9f6fcff63dd Mon Sep 17 00:00:00 2001 From: bbcallen Date: Wed, 14 Aug 2013 12:55:20 +0800 Subject: [PATCH] ffplay: disable overlay buffer diff check --- ijkmedia/ijkplayer/ff_ffplay.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c index 5d971a54..7a2a3178 100644 --- a/ijkmedia/ijkplayer/ff_ffplay.c +++ b/ijkmedia/ijkplayer/ff_ffplay.c @@ -737,8 +737,13 @@ static void alloc_picture(FFPlayer *ffp) vp->bmp = SDL_VoutFFmpeg_CreateOverlay(vp->width, vp->height, ffp->overlay_format, ffp->vout); +#ifdef FFP_MERGE bufferdiff = vp->bmp ? FFMAX(vp->bmp->pixels[0], vp->bmp->pixels[1]) - FFMIN(vp->bmp->pixels[0], vp->bmp->pixels[1]) : 0; if (!vp->bmp || vp->bmp->pitches[0] < vp->width || bufferdiff < (int64_t)vp->height * vp->bmp->pitches[0]) { +#else + /* RV16, RV32 contains only one plane */ + if (!vp->bmp || vp->bmp->pitches[0] < vp->width) { +#endif /* SDL allocates a buffer smaller than requested if the video * overlay hardware is unable to support the requested size. */ av_log(NULL, AV_LOG_FATAL, -- GitLab