From 624612a9ca7a956ff65db71128e7e3eda9068490 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Fri, 8 Aug 2008 14:19:16 +0000 Subject: ext/x264/: Use GQueue in stead of custom queue code. Original commit message from CVS: * ext/x264/Makefile.am: * ext/x264/gstx264enc.c: (gst_x264_enc_set_src_caps), (gst_x264_enc_sink_set_caps), (gst_x264_enc_init), (gst_x264_enc_reset), (gst_x264_enc_finalize), (gst_x264_enc_flush_frames), (gst_x264_enc_sink_event), (gst_x264_enc_chain), (gst_x264_enc_encode_frame), (gst_x264_enc_change_state), (gst_x264_enc_set_property): * ext/x264/gstx264enc.h: Use GQueue in stead of custom queue code. Factorize flushing out encoder delayed frames. Factorize initialization and state change reset. --- ext/x264/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'ext/x264/Makefile.am') diff --git a/ext/x264/Makefile.am b/ext/x264/Makefile.am index 4369f46b..fd664ede 100644 --- a/ext/x264/Makefile.am +++ b/ext/x264/Makefile.am @@ -1,9 +1,14 @@ plugin_LTLIBRARIES = libgstx264.la libgstx264_la_SOURCES = gstx264enc.c -libgstx264_la_CFLAGS = $(X264_CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstx264_la_LIBADD = $(X264_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-$(GST_MAJORMINOR) +libgstx264_la_CFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_CFLAGS) \ + $(X264_CFLAGS) +libgstx264_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ + $(GST_LIBS) \ + $(X264_LIBS) libgstx264_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstx264enc.h -- cgit v1.2.1