diff libmpcodecs/mp_image.c @ 30115:ad61464d02a7

Add support for YUV format with alpha and fix the codecs.conf entry for vp6a to use it. Fixes playback of samples in http://samples.mplayerhq.hu/FLV/flash_with_alpha/

--- a/libmpcodecs/mp_image.c	Thu Dec 31 23:39:21 2009 +0000
+++ b/libmpcodecs/mp_image.c	Thu Dec 31 23:45:07 2009 +0000
@@ -19,24 +19,26 @@
   if (mpi->imgfmt == IMGFMT_IF09) {
     mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8+
                             mpi->chroma_width*mpi->chroma_height);
-    /* export delta table */
-    mpi->planes[3]=mpi->planes[0]+(mpi->width*mpi->height)+2*(mpi->chroma_width*mpi->chroma_height);
   } else
     mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8);
   if (mpi->flags&MP_IMGFLAG_PLANAR) {
     int bpp = IMGFMT_IS_YUVP16(mpi->imgfmt)? 2 : 1;
     // YV12/I420/YVU9/IF09. feel free to add other planar formats here...
-    mpi->stride[0]=bpp*mpi->width;
+    mpi->stride[0]=mpi->stride[3]=bpp*mpi->width;
     if(mpi->num_planes > 2){
       mpi->stride[1]=mpi->stride[2]=bpp*mpi->chroma_width;
       if(mpi->flags&MP_IMGFLAG_SWAPPED){
         // I420/IYUV  (Y,U,V)
         mpi->planes[1]=mpi->planes[0]+mpi->stride[0]*mpi->height;
         mpi->planes[2]=mpi->planes[1]+mpi->stride[1]*mpi->chroma_height;
+        if (mpi->num_planes > 3)
+            mpi->planes[3]=mpi->planes[2]+mpi->stride[2]*mpi->chroma_height;
       } else {
         // YV12,YVU9,IF09  (Y,V,U)
         mpi->planes[2]=mpi->planes[0]+mpi->stride[0]*mpi->height;
         mpi->planes[1]=mpi->planes[2]+mpi->stride[1]*mpi->chroma_height;
+        if (mpi->num_planes > 3)
+            mpi->planes[3]=mpi->planes[1]+mpi->stride[1]*mpi->chroma_height;
       }
     } else {
       // NV12/NV21