From a9904a33bcd273aebd3000c793c2da51ed48d31a Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 16 Jan 2004 14:10:44 +0000 Subject: ext/ffmpeg/gstffmpegenc.c: Link with right caps (else, it segfaults). Original commit message from CVS: 2004-01-16 Ronald Bultje * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect): Link with right caps (else, it segfaults). * ext/mplex/gstmplexjob.cc: Fix for slight API change in 1.6.1.93 release of mjpegtools. --- ChangeLog | 7 +++++++ ext/mplex/gstmplexjob.cc | 15 +-------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index eac86696..c019cb20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-01-16 Ronald Bultje + + * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect): + Link with right caps (else, it segfaults). + * ext/mplex/gstmplexjob.cc: + Fix for slight API change in 1.6.1.93 release of mjpegtools. + 2004-01-15 David Schleef * gst-libs/gst/audio/Makefile.am: diff --git a/ext/mplex/gstmplexjob.cc b/ext/mplex/gstmplexjob.cc index 058ff9a4..09ebe53f 100644 --- a/ext/mplex/gstmplexjob.cc +++ b/ext/mplex/gstmplexjob.cc @@ -35,8 +35,7 @@ enum { ARG_SPLIT_SEQUENCE, ARG_SEGMENT_SIZE, ARG_PACKETS_PER_PACK, - ARG_SECTOR_SIZE, - ARG_WORKAROUND_MPLAYER_HDR + ARG_SECTOR_SIZE /* FILL ME */ }; @@ -142,12 +141,6 @@ GstMplexJob::initProperties (GObjectClass *klass) g_param_spec_int ("sector-size", "Sector size", "Specify sector size in bytes for generic formats", 256, 16384, 2048, (GParamFlags) G_PARAM_READWRITE)); - - /* workarounds */ - g_object_class_install_property (klass, ARG_WORKAROUND_MPLAYER_HDR, - g_param_spec_boolean ("mplayer-hdr-workaround", "MPlayer header workaround", - "Enable a workaround for bugs in MPlayer LCPM header parsing", - FALSE, (GParamFlags) G_PARAM_READWRITE)); } /* @@ -183,9 +176,6 @@ GstMplexJob::getProperty (guint prop_id, case ARG_SECTOR_SIZE: g_value_set_int (value, sector_size); break; - case ARG_WORKAROUND_MPLAYER_HDR: - g_value_set_boolean (value, workarounds.mplayer_pes_headers); - break; default: break; } @@ -223,9 +213,6 @@ GstMplexJob::setProperty (guint prop_id, case ARG_SECTOR_SIZE: sector_size = g_value_get_int (value); break; - case ARG_WORKAROUND_MPLAYER_HDR: - workarounds.mplayer_pes_headers = g_value_get_boolean (value); - break; default: break; } -- cgit v1.2.1