diff --git a/ChangeLog b/ChangeLog index 7ebe42ea71..748574f3ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-01 Sebastian Dröge + + * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_negotiate_format): + Last change introduced a regression that made mpeg2dec handle + some 4:2:2 videos as 4:4:4. Fixes bug #562086. + 2008-11-29 Sebastian Dröge Patch by: Cygwin Ports maintainer diff --git a/common b/common index 03699ffc57..24963a683c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 03699ffc577ee8a42541862f11a6d0d0dff34f41 +Subproject commit 24963a683c185e1405b6f0aad37d95064cced93b diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c index 3718cd359d..fc0d9a2b85 100644 --- a/ext/mpeg2dec/gstmpeg2dec.c +++ b/ext/mpeg2dec/gstmpeg2dec.c @@ -549,8 +549,10 @@ gst_mpeg2dec_negotiate_format (GstMpeg2dec * mpeg2dec) mpeg2dec->v_offs = I420_V_OFFSET (mpeg2dec->decoded_width, mpeg2dec->decoded_height); - } else if (sequence->width == sequence->chroma_width && - sequence->height != sequence->chroma_height) { + } else if ((sequence->width == sequence->chroma_width && + sequence->height != sequence->chroma_height) || + (sequence->width != sequence->chroma_width && + sequence->height == sequence->chroma_height)) { gint halfsize; fourcc = GST_STR_FOURCC ("Y42B");