mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

daala: Fix compilation

Browse source
This commit is contained in:
Sebastian Dröge 2013-11-19 00:38:33 +01:00
parent 27b0086e4a
commit 898966a44c
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/daala/gstdaaladec.c
View file

@ -89,7 +89,6 @@ static gboolean daala_dec_start (GstVideoDecoder * decoder);
static gboolean daala_dec_stop (GstVideoDecoder * decoder); static gboolean daala_dec_stop (GstVideoDecoder * decoder);
static gboolean daala_dec_set_format (GstVideoDecoder * decoder, static gboolean daala_dec_set_format (GstVideoDecoder * decoder,
GstVideoCodecState * state); GstVideoCodecState * state);
static gboolean daala_dec_flush (GstVideoDecoder * decoder);
static GstFlowReturn daala_dec_parse (GstVideoDecoder * decoder, static GstFlowReturn daala_dec_parse (GstVideoDecoder * decoder,
GstVideoCodecFrame * frame, GstAdapter * adapter, gboolean at_eos); GstVideoCodecFrame * frame, GstAdapter * adapter, gboolean at_eos);
static GstFlowReturn daala_dec_handle_frame (GstVideoDecoder * decoder, 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->start = GST_DEBUG_FUNCPTR (daala_dec_start);
video_decoder_class->stop = GST_DEBUG_FUNCPTR (daala_dec_stop); 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->set_format = GST_DEBUG_FUNCPTR (daala_dec_set_format);
video_decoder_class->parse = GST_DEBUG_FUNCPTR (daala_dec_parse); video_decoder_class->parse = GST_DEBUG_FUNCPTR (daala_dec_parse);
video_decoder_class->handle_frame = video_decoder_class->handle_frame =

9
ext/daala/gstdaalaenc.c
View file

@ -175,9 +175,10 @@ daala_enc_finalize (GObject * object)
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static void static gboolean
daala_enc_flush (GstDaalaEnc * enc) daala_enc_flush (GstVideoEncoder * benc)
{ {
GstDaalaEnc *enc = GST_DAALA_ENC (benc);
int quant; int quant;
GST_OBJECT_LOCK (enc); GST_OBJECT_LOCK (enc);
@ -192,6 +193,8 @@ daala_enc_flush (GstDaalaEnc * enc)
enc->encoder = daala_encode_create (&enc->info); enc->encoder = daala_encode_create (&enc->info);
daala_encode_ctl (enc->encoder, OD_SET_QUANT, &quant, sizeof (int)); daala_encode_ctl (enc->encoder, OD_SET_QUANT, &quant, sizeof (int));
return TRUE;
} }
static gboolean static gboolean
@ -361,7 +364,7 @@ daala_enc_set_format (GstVideoEncoder * benc, GstVideoCodecState * state)
gst_video_codec_state_unref (enc->input_state); gst_video_codec_state_unref (enc->input_state);
enc->input_state = gst_video_codec_state_ref (state); enc->input_state = gst_video_codec_state_ref (state);
daala_enc_flush (enc); daala_enc_flush (benc);
enc->initialised = TRUE; enc->initialised = TRUE;
return TRUE; return TRUE;