X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fxfer.C;h=f5c521961105893957209b4d8a3c21298d6169f7;hb=25bafacda1fe9d8a9520cad451547a75d934c1bb;hp=13f49f82975938d9ef8be647a1300a5e4c1c645b;hpb=9df45f6232e108a5f36ba415ff7da8a51ca9dbdc;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/xfer.C b/cinelerra-5.1/guicast/xfer.C index 13f49f82..f5c52196 100644 --- a/cinelerra-5.1/guicast/xfer.C +++ b/cinelerra-5.1/guicast/xfer.C @@ -106,7 +106,8 @@ void BC_Xfer::init( switch( in_colormodel ) { case BC_UVY422: case BC_YUV422: in_w &= ~1; break; // 2x1 - case BC_YUV420P: in_w &= ~1; in_h &= ~1; break; // 2x2 + case BC_YUV420P: + case BC_YUV420PI: in_w &= ~1; in_h &= ~1; break; // 2x2 case BC_YUV422P: in_w &= ~1; break; // 2x1 case BC_YUV410P: in_w &= ~3; in_h &= ~3; break; // 4x4 case BC_YUV411P: in_w &= ~3; break; // 4x1 @@ -114,7 +115,8 @@ void BC_Xfer::init( switch( out_colormodel ) { case BC_UVY422: case BC_YUV422: out_w &= ~1; break; - case BC_YUV420P: out_w &= ~1; out_h &= ~1; break; + case BC_YUV420P: + case BC_YUV420PI: out_w &= ~1; out_h &= ~1; break; case BC_YUV422P: out_w &= ~1; break; case BC_YUV410P: out_w &= ~3; out_h &= ~3; break; case BC_YUV411P: out_w &= ~3; break; @@ -162,7 +164,7 @@ void BC_Xfer::init( this->out_pixelsize = BC_CModels::calculate_pixelsize(out_colormodel); this->scale = (out_w != in_w) || (in_x != 0); -/* + 1 so we don't overflow when calculating in advance */ +/* + 1 so we don't overflow when calculating in advance */ column_table = new int[out_w+1]; double hscale = (double)in_w/out_w; for( int i=0; i