summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-09 21:21:46 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-09 21:21:46 +0000
commitbb78cb5401558aec3289e423176e547ca77b26f0 (patch)
tree2f7faf5dcb9b086680679be8dd689a2bf693d60b /libmpcodecs
parent01a878c9216effa34f79880919a6088d50f60bf8 (diff)
downloadmpv-bb78cb5401558aec3289e423176e547ca77b26f0.tar.bz2
mpv-bb78cb5401558aec3289e423176e547ca77b26f0.tar.xz
YUV422P dr1 fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11065 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vd_ffmpeg.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index a5117fa0a7..48f79f353d 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -128,7 +128,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
case IMGFMT_I420:
// "converted" using pointer/stride modification
if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap
- if(avctx->pix_fmt==PIX_FMT_YUV422P) return CONTROL_TRUE;// half stride
+ if(avctx->pix_fmt==PIX_FMT_YUV422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride
break;
#ifdef HAVE_XVMC
case IMGFMT_XVMC_IDCT_MPEG2:
@@ -170,9 +170,6 @@ static int init(sh_video_t *sh){
if(lavc_codec->capabilities&CODEC_CAP_DR1)
ctx->do_dr1=1;
- //XXX:FIXME:HACK:UGLY 422P with direct rendering is buggy cuz of that chroma stride trick ...
- if(sh->format == mmioFOURCC('H','F','Y','U'))
- ctx->do_dr1=0;
ctx->b_age= ctx->ip_age[0]= ctx->ip_age[1]= 256*256*256*64;
ctx->ip_count= ctx->b_count= 0;
@@ -416,6 +413,7 @@ static int init_vo(sh_video_t *sh){
default:
ctx->best_csp=0;
}
+
if (!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h, ctx->best_csp))
return -1;
}