ext/mpeg2dec/gstmpeg2dec.c: Assume pixel-aspect-ratio of 4:3 if libmpeg2dec doesn...

Original commit message from CVS:
* ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_negotiate_format):
Assume pixel-aspect-ratio of 4:3 if libmpeg2dec doesn't give us
any PAR whatsoever (rather than using 0/0, which will lead to
an abort later on). Fixes #345184.

diff --git a/ChangeLog b/ChangeLog
index 08ddbf23c7da21579d8661e5e1b36604cfb39bf1..f491573cb90f7064addb824e4f8f45c144efb078 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-19  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_negotiate_format):
+         Assume pixel-aspect-ratio of 4:3 if libmpeg2dec doesn't give us
+         any PAR whatsoever (rather than using 0/0, which will lead to
+         an abort later on). Fixes #345184.
+
 2006-06-17  Tim-Philipp Müller  <tim at centricular dot net>
 
        Patch by: Michael Dominic K.  < mdk at mdk org pl>

diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c
index 33995f0f0ed27d1be434b0d28be995564e4722c9..05af5f72b66954fb1b87160c88f31cb23cb5ed35 100644 (file)
--- a/ext/mpeg2dec/gstmpeg2dec.c
+++ b/ext/mpeg2dec/gstmpeg2dec.c
@@ -542,6 +542,12 @@ gst_mpeg2dec_negotiate_format (GstMpeg2dec * mpeg2dec)
     return (FALSE);
   }
 
+  if (mpeg2dec->pixel_width == 0 || mpeg2dec->pixel_height == 0) {
+    GST_WARNING_OBJECT (mpeg2dec, "Unknown pixel-aspect-ratio - assuming 4:3");
+    mpeg2dec->pixel_width = 4;
+    mpeg2dec->pixel_height = 3;
+  }
+
   caps = gst_caps_new_simple ("video/x-raw-yuv",
       "format", GST_TYPE_FOURCC, fourcc,
       "width", G_TYPE_INT, mpeg2dec->width,