[vlc-commits] bluray: fix blanking
Petri Hintukainen
git at videolan.org
Sun Mar 20 15:54:05 CET 2016
vlc | branch: master | Petri Hintukainen <phintuka at gmail.com> | Sat Mar 19 15:00:43 2016 +0200| [b42159f279052b5c065a6b96a308a3efcacdf7e6] | committer: Petri Hintukainen
bluray: fix blanking
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b42159f279052b5c065a6b96a308a3efcacdf7e6
---
modules/access/bluray.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 79cdd13..1555b32 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -388,18 +388,17 @@ static void startBackground(demux_t *p_demux)
fmt.i_group = 1;
p_sys->p_dummy_video = es_out_Add(p_demux->out, &fmt);
- es_format_Clean(&fmt);
if (!p_sys->p_dummy_video) {
- msg_Err(p_demux, "Error adding background ES");
- return;
+ msg_Err(p_demux, "Error adding background ES");
+ goto out;
}
block_t *p_block = block_Alloc(fmt.video.i_width * fmt.video.i_height *
fmt.video.i_bits_per_pixel / 8);
if (!p_block) {
msg_Err(p_demux, "Error allocating block for background video");
- return;
+ goto out;
}
// XXX TODO: what would be correct timestamp ???
@@ -411,6 +410,9 @@ static void startBackground(demux_t *p_demux)
memset(p, 0x80, fmt.video.i_width * fmt.video.i_height / 2);
es_out_Send(p_demux->out, p_sys->p_dummy_video, p_block);
+
+ out:
+ es_format_Clean(&fmt);
}
static void stopBackground(demux_t *p_demux)
More information about the vlc-commits
mailing list