[vlc-commits] access: cdrom: don't merge cdtext across blocks

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Jun  3 17:25:45 2019 +0200| [8734abe06a4c213b299b90e931c7fbda75bd7c36] | committer: Francois Cartegnie

access: cdrom: don't merge cdtext across blocks

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8734abe06a4c213b299b90e931c7fbda75bd7c36
---

 modules/access/vcd/cdrom.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index c8e3218e40..129949aadd 100644
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -1224,6 +1224,9 @@ static int CdTextParse( vlc_meta_t ***ppp_tracks, int *pi_tracks,
         const int i_extension_flag = ( p_block[1] >> 7)& 0x01;
         if( i_extension_flag )
             continue;
+        const uint8_t i_block_number = (p_pack[3] >> 4) & 0x07;
+        if( i_block_number > 0 )
+            continue;
 
         //const int i_sequence_number = p_block[2];
         //const int i_charater_position = (p_block[3] >> 0) &0x0f;