diff options
| author | Thiago Santos <ts.santos@sisa.samsung.com> | 2014-04-25 10:39:19 -0300 |
|---|---|---|
| committer | Thiago Santos <ts.santos@sisa.samsung.com> | 2014-04-29 18:49:15 -0300 |
| commit | cc262b0923686b054b341413a96c9f16a0dc04e4 (patch) | |
| tree | af8431cd540e5d924eee88788bd3c0784dbfd0be | |
| parent | f6b0cae8b6554cb831a76c81b5f8f8a6481a79d3 (diff) | |
| download | gstreamer-plugins-bad-cc262b0923686b054b341413a96c9f16a0dc04e4.tar.gz | |
hlsdemux: fix decryption function return
Correctly return the decrypted buffer when it succeeds and
return NULL otherwise
| -rw-r--r-- | ext/hls/gsthlsdemux.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c index 596e6cd63..e792b15b8 100644 --- a/ext/hls/gsthlsdemux.c +++ b/ext/hls/gsthlsdemux.c @@ -776,7 +776,7 @@ _src_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) gst_buffer_unmap (key_buffer, &key_info); gst_buffer_unref (key_buffer); - gst_object_unref (key_fragment); + g_object_unref (key_fragment); } 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 (encrypted_buffer, &encrypted_info); + gst_buffer_unref (encrypted_buffer); + + return decrypted_buffer; + decrypt_error: GST_ERROR_OBJECT (demux, "Failed to decrypt fragment"); 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 (decrypted_buffer); - return decrypted_buffer; + return NULL; } static void |