mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: fix decryption function return

Browse source 
Correctly return the decrypted buffer when it succeeds and
return NULL otherwise
This commit is contained in:
Thiago Santos 2014-04-25 10:39:19 -03:00
parent f6b0cae8b6
commit cc262b0923
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/hls/gsthlsdemux.c
View file

@ -776,7 +776,7 @@ _src_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
gst_buffer_unmap (key_buffer, &key_info); gst_buffer_unmap (key_buffer, &key_info);
gst_buffer_unref (key_buffer); gst_buffer_unref (key_buffer);
gst_object_unref (key_fragment); g_object_unref (key_fragment);
} }
gst_adapter_push (demux->adapter, buffer); gst_adapter_push (demux->adapter, buffer);
@ -1703,6 +1703,10 @@ gst_hls_demux_decrypt_fragment (GstHLSDemux * demux,
gst_buffer_unmap (decrypted_buffer, &decrypted_info); gst_buffer_unmap (decrypted_buffer, &decrypted_info);
gst_buffer_unmap (encrypted_buffer, &encrypted_info); gst_buffer_unmap (encrypted_buffer, &encrypted_info);
gst_buffer_unref (encrypted_buffer);
return decrypted_buffer;
decrypt_error: decrypt_error:
GST_ERROR_OBJECT (demux, "Failed to decrypt fragment"); GST_ERROR_OBJECT (demux, "Failed to decrypt fragment");
g_set_error (err, GST_STREAM_ERROR, GST_STREAM_ERROR_DECRYPT, g_set_error (err, GST_STREAM_ERROR, GST_STREAM_ERROR_DECRYPT,
@ -1714,7 +1718,7 @@ decrypt_error:
gst_buffer_unref (encrypted_buffer); gst_buffer_unref (encrypted_buffer);
gst_buffer_unref (decrypted_buffer); gst_buffer_unref (decrypted_buffer);
return decrypted_buffer; return NULL;
} }
static void static void