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

vaapiencode: don't crash on NULL encoder on _finish().

Browse source 
Don't try to destroy an encoder, in GstVideoEncoder::finish() handler,
if it was not created in the first place. Return "not-negotiated" error
since this means we did not even reach GstVideoEncoder::set_format(),
where the encoder could have been created.

This fixes a crash when the vaapiencode_* plug-in elements get deallocated
and that we failed to negotiate either pad.

https://bugzilla.gnome.org/show_bug.cgi?id=719704
This commit is contained in:
Gwenole Beauchesne 2014-01-13 17:18:42 +01:00
parent ea7c1d87c5
commit 2c4fde0eae
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/vaapi/gstvaapiencode.c
View file

@ -587,6 +587,13 @@ gst_vaapiencode_finish (GstVideoEncoder * venc)
GstVaapiEncoderStatus status; GstVaapiEncoderStatus status;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
/* Don't try to destroy encoder if none was created in the first place.
Return "not-negotiated" error since this means we did not even reach
GstVideoEncoder::set_format() state, where the encoder could have
been created */
if (!encode->encoder)
return GST_FLOW_NOT_NEGOTIATED;
status = gst_vaapi_encoder_flush (encode->encoder); status = gst_vaapi_encoder_flush (encode->encoder);
GST_VIDEO_ENCODER_STREAM_UNLOCK (encode); GST_VIDEO_ENCODER_STREAM_UNLOCK (encode);