--- trunk/xvidcore/src/image/image.c 2011/03/08 19:18:44 1959 +++ trunk/xvidcore/src/image/image.c 2019/01/17 14:25:05 2173 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: image.c,v 1.48 2011-03-08 19:16:32 Isibaar Exp $ + * $Id$ * ****************************************************************************/ @@ -151,8 +151,8 @@ /* According to the Standard Clause 7.6.4, padding is done starting at 16 * pixel width and height multiples. This was not respected in old xvids */ - if (bs_version >= SETEDGES_BUG_BEFORE && - bs_version < SETEDGES_BUG_AFTER || + if ((bs_version >= SETEDGES_BUG_BEFORE && + bs_version < SETEDGES_BUG_AFTER) || bs_version >= SETEDGES_BUG_REFIXED) { width = (width+15)&~15; height = (height+15)&~15; @@ -415,10 +415,10 @@ /* packed conversions require height to be divisable by 2 (or even by 4 for interlaced conversion) */ - if (interlacing) - height_opt = height & (~3); - else - height_opt = height & (~1); + if (interlacing) + height_opt = height & (~3); + else + height_opt = height & (~1); func_opt(x_ptr, x_stride, y_ptr, u_ptr, v_ptr, y_stride, uv_stride,