summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2007-08-01 17:43:39 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2007-08-01 17:43:39 +0000
commit907d7e40f5cde52bdff25e4501677165cdb4cd58 (patch)
treea4edf0cf9b3951b0a166ebc2ad1fca68e1c15e07 /tests
parent8e16a398368a11089ada00b7f560a7ae721ce758 (diff)
downloadgst-libav-907d7e40f5cde52bdff25e4501677165cdb4cd58.tar.gz
ext/ffmpeg/: Free strings atleast when finalizing elements.
Original commit message from CVS: * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_cfg_install_property), (gst_ffmpeg_cfg_finalize): * ext/ffmpeg/gstffmpegcfg.h: * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_finalize), (ffmpegenc_setup_working_buf), (gst_ffmpegenc_chain_video), (gst_ffmpegenc_flush_buffers): Free strings atleast when finalizing elements. * tests/check/generic/libavcodec-locking.c: (GST_START_TEST), (simple_launch_lines_suite): Fix some leaks.
Diffstat (limited to 'tests')
-rw-r--r--tests/check/generic/libavcodec-locking.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/check/generic/libavcodec-locking.c b/tests/check/generic/libavcodec-locking.c
index 88d321a..4e484f8 100644
--- a/tests/check/generic/libavcodec-locking.c
+++ b/tests/check/generic/libavcodec-locking.c
@@ -36,7 +36,7 @@ setup_pipeline (const gchar * pipe_descr)
return pipeline;
}
-/*
+/*
* run_pipeline:
* @pipe: the pipeline to run
* @desc: the description for use in messages
@@ -101,22 +101,21 @@ GST_START_TEST (test_libavcodec_locks)
for (i=0; i<NUM_SINKS; i++)
sink[i] = g_strdup_printf (" t.src%d ! queue ! ffenc_mpeg4 ! ffdec_mpeg4 ! fakesink sync=true", i);
-
+
sink [NUM_SINKS] = NULL;
-
+
sinks = g_strjoinv (" ", sink);
-
+
s = g_strdup_printf ("videotestsrc ! video/x-raw-yuv,format=(fourcc)I420,width=320,height=240,framerate=(fraction)10/1 ! tee name=t %s", sinks);
-
+
run_pipeline (setup_pipeline (s), s,
GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
GST_MESSAGE_UNKNOWN);
-
g_free (s);
for (i=0; i<NUM_SINKS; i++)
g_free (sink[i]);
-
+ g_free (sinks);
}
GST_END_TEST Suite *
@@ -138,6 +137,7 @@ simple_launch_lines_suite (void)
suite_add_tcase (s, tc_chain);
+#ifndef GST_DISABLE_PARSE
/* only run this if we haven't been configured with --disable-encoders */
if (gst_default_registry_check_feature_version ("ffenc_mpeg4",
GST_VERSION_MAJOR, GST_VERSION_MINOR, 0)) {
@@ -145,7 +145,8 @@ simple_launch_lines_suite (void)
} else {
g_print ("******* Skipping libavcodec_locks test, no encoder available\n");
}
-
+#endif
+
return s;
}