--- branches/release-1_3-branch/xvidcore/src/image/image.c 2011/03/08 19:18:44 1959 +++ branches/release-1_3-branch/xvidcore/src/image/image.c 2011/03/21 16:00:35 1968 @@ -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.46.2.2 2011-03-08 19:18:34 Isibaar Exp $ + * $Id: image.c,v 1.46.2.3 2011-03-21 16:00:35 Isibaar Exp $ * ****************************************************************************/ @@ -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;