diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-12-01 14:39:34 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-12-01 14:39:34 +0000 |
| commit | 81599fc784be9283d37968da6f35d2946305b675 (patch) | |
| tree | 1a96ab9fc3ac16dc5fd467c7069dc19acdaa5a2c | |
| parent | bc794219f3f93dd63f2905a472b26d5c1fc0faea (diff) | |
ext/mpeg2dec/gstmpeg2dec.c: Last change introduced a regression that made mpeg2dec handle some 4:2:2 videos as 4:4:4....
Original commit message from CVS:
* 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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | ext/mpeg2dec/gstmpeg2dec.c | 6 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2008-12-01 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * 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 <sebastian.droege@collabora.co.uk> Patch by: Cygwin Ports maintainer diff --git a/common b/common -Subproject 03699ffc577ee8a42541862f11a6d0d0dff34f4 +Subproject 24963a683c185e1405b6f0aad37d95064cced93 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"); |