[aravis] gst_plugins: fix incorrect function call



commit f6e06a88cd0744a6a76a97fb170f590e387b2986
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Wed Aug 20 00:18:19 2014 +0200

    gst_plugins: fix incorrect function call

 gst-0.10/Makefile.am |    6 +-----
 gst-0.10/gstaravis.c |    2 +-
 gst/Makefile.am      |    6 +-----
 gst/gstaravis.c      |    2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/gst-0.10/Makefile.am b/gst-0.10/Makefile.am
index 4b822fd..4a260bc 100644
--- a/gst-0.10/Makefile.am
+++ b/gst-0.10/Makefile.am
@@ -7,11 +7,7 @@ AM_CPPFLAGS = \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" $(ARAVIS_GST_0_10_PLUGIN_CFLAGS) \
        -DG_LOG_DOMAIN=\"Aravis\"
 
-AM_CFLAGS =\
-        -Wall\
-        -Werror \
-        -g \
-        -O0
+AM_CFLAGS = -Wall
 
 gst010plugin_LTLIBRARIES = libgstaravis- ARAVIS_API_VERSION@.la
 
diff --git a/gst-0.10/gstaravis.c b/gst-0.10/gstaravis.c
index b3fc7cc..1b4658e 100644
--- a/gst-0.10/gstaravis.c
+++ b/gst-0.10/gstaravis.c
@@ -380,7 +380,7 @@ gst_aravis_create (GstPushSrc * push_src, GstBuffer ** buffer)
        buffer_data = (char *) arv_buffer_get_data (arv_buffer, &buffer_size);
        arv_buffer_get_image_region (arv_buffer, NULL, NULL, &width, &height);
        arv_row_stride = width * ARV_PIXEL_FORMAT_BIT_PER_PIXEL (arv_buffer_get_image_pixel_format 
(arv_buffer)) / 8;
-       timestamp_ns = arv_buffer_get_image_timestamp (arv_buffer);
+       timestamp_ns = arv_buffer_get_timestamp (arv_buffer);
 
        /* Gstreamer requires row stride to be a multiple of 4 */
        if ((arv_row_stride & 0x3) != 0) {
diff --git a/gst/Makefile.am b/gst/Makefile.am
index dfd1aa8..43bb327 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -7,11 +7,7 @@ AM_CPPFLAGS = \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" $(ARAVIS_GST_PLUGIN_CFLAGS) \
        -DG_LOG_DOMAIN=\"Aravis\"
 
-AM_CFLAGS =\
-        -Wall\
-        -Werror \
-        -g \
-        -O0
+AM_CFLAGS = -Wall
 
 gstplugin_LTLIBRARIES = libgstaravis- ARAVIS_API_VERSION@.la
 
diff --git a/gst/gstaravis.c b/gst/gstaravis.c
index 99fb953..f6f4148 100644
--- a/gst/gstaravis.c
+++ b/gst/gstaravis.c
@@ -366,7 +366,7 @@ gst_aravis_create (GstPushSrc * push_src, GstBuffer ** buffer)
        buffer_data = (char *) arv_buffer_get_data (arv_buffer, &buffer_size);
        arv_buffer_get_image_region (arv_buffer, NULL, NULL, &width, &height);
        arv_row_stride = width * ARV_PIXEL_FORMAT_BIT_PER_PIXEL (arv_buffer_get_image_pixel_format 
(arv_buffer)) / 8;
-       timestamp_ns = arv_buffer_get_image_timestamp (arv_buffer);
+       timestamp_ns = arv_buffer_get_timestamp (arv_buffer);
 
        /* Gstreamer requires row stride to be a multiple of 4 */
        if ((arv_row_stride & 0x3) != 0) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]