fix mpeg2 chroma_420_type

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

libavcodec/mpeg12.c

@@ -468,8 +468,8 @@ void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
         put_bits(&s->pb, 1, s->intra_vlc_format);
         put_bits(&s->pb, 1, s->alternate_scan);
         put_bits(&s->pb, 1, s->repeat_first_field);
-        put_bits(&s->pb, 1, s->chroma_420_type=1);
         s->progressive_frame = s->progressive_sequence;
+        put_bits(&s->pb, 1, s->chroma_420_type=s->progressive_frame);
         put_bits(&s->pb, 1, s->progressive_frame);
         put_bits(&s->pb, 1, 0); //composite_display_flag
     }

tests/ffmpeg.regression.ref

@@ -11,15 +11,15 @@ stddev:  7.69 PSNR:30.40 bytes:7602176
 746381 ./data/a-mpeg2.mpg
 c7b9a71245912671889849ed560b67d3 *./data/out.yuv
 stddev:  7.69 PSNR:30.40 bytes:7602176
-2a77ebec455e17c4ab897044c9b3040a *./data/a-mpeg2i.mpg
+59d4471ff2a9749824b4d813900afdfc *./data/a-mpeg2i.mpg
 754366 ./data/a-mpeg2i.mpg
 ddf889858529d09c8fe31c701deacd16 *./data/out.yuv
 stddev:  7.71 PSNR:30.37 bytes:7602176
-d3d2fd4dd186d8c9de7666398d5af13a *./data/a-mpeg2thread.mpg
+781531fff6e20c986a3bcc189fc34e98 *./data/a-mpeg2thread.mpg
 816506 ./data/a-mpeg2thread.mpg
 9db3aca554bb8ee337a109a3b8629575 *./data/out.yuv
 stddev:  7.64 PSNR:30.45 bytes:7602176
-052bcdb13286f4f7137a50c4db032104 *./data/a-mpeg2reuse.mpg
+6e51bb9da148f9128fde429089349c43 *./data/a-mpeg2reuse.mpg
 2115703 ./data/a-mpeg2reuse.mpg
 526e6e6818296a1b63d91fc165e0bda8 *./data/out.yuv
 stddev:  7.68 PSNR:30.41 bytes:7602176

tests/rotozoom.regression.ref

@@ -11,15 +11,15 @@ eba2bff497863dbe8dad4a771fe14910 *./data/a-mpeg2.mpg
 198404 ./data/a-mpeg2.mpg
 107af0aac7f32378988469bd6eae9c31 *./data/out.yuv
 stddev:  4.98 PSNR:34.17 bytes:7602176
-92962436161235f3cd2cede031eec94b *./data/a-mpeg2i.mpg
+8d0a7f9b0b4cb5a7e4980051994e1390 *./data/a-mpeg2i.mpg
 205006 ./data/a-mpeg2i.mpg
 d215d0f3cbbfb687a929ccf2dd1a034a *./data/out.yuv
 stddev:  4.99 PSNR:34.16 bytes:7602176
-df6924f747ea4355f9072e7ab0fe776d *./data/a-mpeg2thread.mpg
+80d7c5f8159094ba5497d9b890906ee5 *./data/a-mpeg2thread.mpg
 184101 ./data/a-mpeg2thread.mpg
 abc276d30f874cb36d2fa113dabc67a8 *./data/out.yuv
 stddev:  4.76 PSNR:34.56 bytes:7602176
-339be26f8e88f27c8a7811c427e24492 *./data/a-mpeg2reuse.mpg
+0dfacb76a7097614c2dddd27b25f1162 *./data/a-mpeg2reuse.mpg
 397244 ./data/a-mpeg2reuse.mpg
 caa7723366dd267a5a14775565f2df2e *./data/out.yuv
 stddev:  4.77 PSNR:34.54 bytes:7602176