diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2013-11-19 00:38:33 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-02-10 10:47:22 +0100 |
| commit | 67a82fe3bba906626254a8e54cbd63b29d73a0d9 (patch) | |
| tree | 1353e4b4b417d103a8121e797752e7367eb4bf60 | |
| parent | c1f5e09ce341f3438fb601a852ee70e72d375646 (diff) | |
| download | gstreamer-plugins-bad-67a82fe3bba906626254a8e54cbd63b29d73a0d9.tar.gz | |
daala: Fix compilation
| -rw-r--r-- | ext/daala/gstdaaladec.c | 2 | ||||
| -rw-r--r-- | ext/daala/gstdaalaenc.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/daala/gstdaaladec.c b/ext/daala/gstdaaladec.c index 0057c5339..22327a2c1 100644 --- a/ext/daala/gstdaaladec.c +++ b/ext/daala/gstdaaladec.c @@ -89,7 +89,6 @@ static gboolean daala_dec_start (GstVideoDecoder * decoder); static gboolean daala_dec_stop (GstVideoDecoder * decoder); static gboolean daala_dec_set_format (GstVideoDecoder * decoder, GstVideoCodecState * state); -static gboolean daala_dec_flush (GstVideoDecoder * decoder); static GstFlowReturn daala_dec_parse (GstVideoDecoder * decoder, GstVideoCodecFrame * frame, GstAdapter * adapter, gboolean at_eos); static GstFlowReturn daala_dec_handle_frame (GstVideoDecoder * decoder, @@ -117,7 +116,6 @@ gst_daala_dec_class_init (GstDaalaDecClass * klass) video_decoder_class->start = GST_DEBUG_FUNCPTR (daala_dec_start); video_decoder_class->stop = GST_DEBUG_FUNCPTR (daala_dec_stop); - video_decoder_class->flush = GST_DEBUG_FUNCPTR (daala_dec_flush); video_decoder_class->set_format = GST_DEBUG_FUNCPTR (daala_dec_set_format); video_decoder_class->parse = GST_DEBUG_FUNCPTR (daala_dec_parse); video_decoder_class->handle_frame = diff --git a/ext/daala/gstdaalaenc.c b/ext/daala/gstdaalaenc.c index 9d51842f0..1aa2a78ce 100644 --- a/ext/daala/gstdaalaenc.c +++ b/ext/daala/gstdaalaenc.c @@ -175,9 +175,10 @@ daala_enc_finalize (GObject * object) G_OBJECT_CLASS (parent_class)->finalize (object); } -static void -daala_enc_flush (GstDaalaEnc * enc) +static gboolean +daala_enc_flush (GstVideoEncoder * benc) { + GstDaalaEnc *enc = GST_DAALA_ENC (benc); int quant; GST_OBJECT_LOCK (enc); @@ -192,6 +193,8 @@ daala_enc_flush (GstDaalaEnc * enc) enc->encoder = daala_encode_create (&enc->info); daala_encode_ctl (enc->encoder, OD_SET_QUANT, &quant, sizeof (int)); + + return TRUE; } static gboolean @@ -361,7 +364,7 @@ daala_enc_set_format (GstVideoEncoder * benc, GstVideoCodecState * state) gst_video_codec_state_unref (enc->input_state); enc->input_state = gst_video_codec_state_ref (state); - daala_enc_flush (enc); + daala_enc_flush (benc); enc->initialised = TRUE; return TRUE; |