100l (mixing chroma & luma linesize)

Originally committed as revision 1298 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index b3565d3..0e07f8d 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2338,8 +2338,8 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
             if(s->dsp.pix_abs8x8(ptr_y            + 8, dest_y            + 8, wrap_y) < 20*s->qscale) skip_dct[1]= 1;
             if(s->dsp.pix_abs8x8(ptr_y +dct_offset   , dest_y +dct_offset   , wrap_y) < 20*s->qscale) skip_dct[2]= 1;
             if(s->dsp.pix_abs8x8(ptr_y +dct_offset+ 8, dest_y +dct_offset+ 8, wrap_y) < 20*s->qscale) skip_dct[3]= 1;
-            if(s->dsp.pix_abs8x8(ptr_cb              , dest_cb              , wrap_y) < 20*s->qscale) skip_dct[4]= 1;
-            if(s->dsp.pix_abs8x8(ptr_cr              , dest_cr              , wrap_y) < 20*s->qscale) skip_dct[5]= 1;
+            if(s->dsp.pix_abs8x8(ptr_cb              , dest_cb              , wrap_c) < 20*s->qscale) skip_dct[4]= 1;
+            if(s->dsp.pix_abs8x8(ptr_cr              , dest_cr              , wrap_c) < 20*s->qscale) skip_dct[5]= 1;
 #if 0
 {
  static int stat[7];

diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 3f48fc0..3e324d5 100644 (file)
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -1,20 +1,20 @@
 ffmpeg regression test
-68c8a6bd81f69764063eabc2a66c9a59 *./data/a-mpeg1.mpg
-4971324b08d4bf0a98a708d3b1a0799b *./data/out.yuv
+cd28e71742a6dead8e0d33987bd7bf44 *./data/a-mpeg1.mpg
+74bda91990c18e7b219d84b7ac970816 *./data/out.yuv
 01410257b88ee5d1c390737d4274bd3f *./data/a-msmpeg4v2.avi
 a1d54e9d006cc31a5b71dabadbb4df53 *./data/out.yuv
 6a9d8f162eb59b8bbf7c737ede86ef8b *./data/a-msmpeg4.avi
 bdd8dc1182fa731f54c3b5ebf9002e40 *./data/out.yuv
-8c242521ffa3854c774b3ac49c85aff4 *./data/a-wmv1.avi
-aeb7bc27b29d894e2dc558e9e2dce089 *./data/out.yuv
+9b0494986a6d27cc51eaf61f14b31043 *./data/a-wmv1.avi
+169031aa2cdd74e58f1c144efc7c03e6 *./data/out.yuv
 30abed5bc6a127b04b73bb436ad3b55a *./data/a-h263.avi
 0059bed3addc017d9f089f3256769a51 *./data/out.yuv
-78b315bb537cc6e04bdd2a8843a4a7d8 *./data/a-h263p.avi
-1077099de78ec2b3a573c2ee0fd0303a *./data/out.yuv
-5b1886c7f754244126cb007b12db6fca *./data/a-odivx.avi
-46795a8e36efb498801a8edba6c76425 *./data/out.yuv
-1e5c838d1645e8a43f1323d615a5afce *./data/a-mpeg4-rc.avi
-e8166d2605192eebafa54d702d4691da *./data/out.yuv
+8d5cb42c511fc35fde63009b0abf24dd *./data/a-h263p.avi
+f7b3140fea7b70a5673061aebe547562 *./data/out.yuv
+a180b84cc43ab6bed7796354385f00c1 *./data/a-odivx.avi
+3a1463cf62c2bee9046870f34400494c *./data/out.yuv
+d64b3c8a7e549b8e32c6101813ad2e02 *./data/a-mpeg4-rc.avi
+f881bf7db273282791c18330bcae338d *./data/out.yuv
 685812396445ac5c79f345965dca6b09 *./data/a-mpeg4-adv.avi
 1d6c3ba2b096ac6df63f1dcabe3ed603 *./data/out.yuv
 2846c8e3d97d7395eb746bfce44e0443 *./data/a-mjpeg.avi