Mercurial > mplayer.hg

changeset 34665:ca53dc5326fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust MPlayer default alignment values to match FFmpeg's. Fixes "stride changed" errors when using e.g. MPEG-2 decoder with -vf unsharp.
author reimar
date Tue, 21 Feb 2012 20:40:59 +0000
parents 4df4d842d5fb
children a5c69b91ff2c
files libmpcodecs/vf.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf.c	Tue Feb 21 19:44:21 2012 +0000
+++ b/libmpcodecs/vf.c	Tue Feb 21 20:40:59 2012 +0000
@@ -290,7 +290,7 @@
   if (w == -1) w = vf->w;
   if (h == -1) h = vf->h;
 
-  w2=(mp_imgflag&MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE)?((w+15)&(~15)):w;
+  w2=(mp_imgflag&MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE)?FFALIGN(w, 32):w;
 
   if(vf->put_image==vf_next_put_image){
       // passthru mode, if the filter uses the fallback/default put_image() code
@@ -382,8 +382,8 @@
           if(mp_imgflag&MP_IMGFLAG_PREFER_ALIGNED_STRIDE){
               int align=(mpi->flags&MP_IMGFLAG_PLANAR &&
                          mpi->flags&MP_IMGFLAG_YUV) ?
-                         (8<<mpi->chroma_x_shift)-1 : 15; // -- maybe FIXME
-              w2=((w+align)&(~align));
+                         (16<<mpi->chroma_x_shift) : 32; // -- maybe FIXME
+              w2=FFALIGN(w, align);
               if(mpi->width!=w2){
                   // we have to change width... check if we CAN co it:
                   int flags=vf->query_format(vf,outfmt); // should not fail