diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:04:07 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:07:30 +0200 |
| commit | 69fe2522f8c2a04eda112eee6319ca2e85d7038b (patch) | |
| tree | 83a8b19997e621309344ca1f3997a48886ef0944 /libvo | |
| parent | 9436e0452fad48e671d7320cb18c588655f3d230 (diff) | |
| parent | 1cda8b002fb19c3da14760fe1f9fc76992a05c29 (diff) | |
| download | mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.bz2 mpv-69fe2522f8c2a04eda112eee6319ca2e85d7038b.tar.xz | |
Merge svn changes up to r30301
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_directfb2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index a502647a6d..4a88b3881e 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -1145,8 +1145,7 @@ static uint32_t get_image(mp_image_t *mpi) // printf("width=%d vs. pitch=%d, flags=0x%X \n",mpi->width,pitch,mpi->flags); - if((mpi->width==pitch) || - (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH))){ + if(mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH)){ // we're lucky or codec accepts stride => ok, let's go! if (frame) { |