mnauw gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/ext/x264/

--===============9140817748225301278==

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     mnauw
Date:           Mon Jan 05 2009  10:29:12 UTC

Log message:
* ext/x264/gstx264enc.c: (gst_x264_enc_class_init),
(gst_x264_enc_header_buf), (gst_x264_enc_encode_frame):
Use hyphen in property name, perform safety buffer size check
prior to mem access, and some more parentheses in macro.

Modified files:
    .               : ChangeLog
    ext/x264        : gstx264enc.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3852&r2=1.3853
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/x264/gstx264enc.c.diff?r1=1.18&r2=1.19

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3852
retrieving revision 1.3853
diff -u -d -r1.3852 -r1.3853
--- ChangeLog	5 Jan 2009 10:22:27 -0000	1.3852
+++ ChangeLog	5 Jan 2009 10:28:57 -0000	1.3853
@@ -1,3 +1,10 @@
+2009-01-05  Mark Nauwelaerts  <[email protected]>
+
+	* ext/x264/gstx264enc.c: (gst_x264_enc_class_init),
+	(gst_x264_enc_header_buf), (gst_x264_enc_encode_frame):
+	Use hyphen in property name, perform safety buffer size check
+	prior to mem access, and some more parentheses in macro.
 2009-01-05  Sebastian Dröge  <[email protected]>
 
 	* gst/mxf/mxfaes-bwf.c:
Index: gstx264enc.c
RCS file: /cvs/gstreamer/gst-plugins-bad/ext/x264/gstx264enc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gstx264enc.c	2 Jan 2009 01:44:11 -0000	1.18
+++ gstx264enc.c	5 Jan 2009 10:28:58 -0000	1.19
@@ -334,7 +334,7 @@
           "Enable trellis searched quantization", ARG_TRELLIS_DEFAULT,
           G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, ARG_KEYINT_MAX,
-      g_param_spec_uint ("key_int_max", "Key-frame maximal interval",
+      g_param_spec_uint ("key-int-max", "Key-frame maximal interval",
           "Maximal distance between two key-frames (0 for automatic)",
           0, G_MAXINT, ARG_KEYINT_MAX_DEFAULT, G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, ARG_CABAC,
@@ -667,8 +667,9 @@
   /* x264 is expected to return an SEI (some identification info),
    * followed by an SPS and PPS */
-  if (i_nal != 3 || nal[1].i_type != 7 || nal[2].i_type != 8) {
-    GST_ELEMENT_ERROR (encoder, STREAM, ENCODE, NULL,
+  if (i_nal != 3 || nal[1].i_type != 7 || nal[2].i_type != 8 ||
+      nal[1].i_payload < 4 || nal[2].i_payload < 1) {
+    GST_ELEMENT_ERROR (encoder, STREAM, ENCODE, (NULL),
         ("Unexpected x264 header."));
     return NULL;
   }
@@ -941,7 +942,7 @@
     duration = GST_BUFFER_DURATION (in_buf);
     gst_buffer_unref (in_buf);
   } else {
         ("Timestamp queue empty."));
     return GST_FLOW_ERROR;


--===============9140817748225301278==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------------------------

--===============9140817748225301278==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose

--===============9140817748225301278==--