[vlc-devel] commit: Support clpi/mpls avchd version (untested). (Laurent Aimar )

git version control git at videolan.org
Sat Jan 24 11:30:33 CET 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Jan 24 11:18:16 2009 +0100| [add114aa102701eeac9ffe5347d363068baad9ae] | committer: Laurent Aimar 

Support clpi/mpls avchd version (untested).

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

 modules/access/bd/clpi.c |    3 ++-
 modules/access/bd/mpls.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/access/bd/clpi.c b/modules/access/bd/clpi.c
index cba1296..5f88fa4 100644
--- a/modules/access/bd/clpi.c
+++ b/modules/access/bd/clpi.c
@@ -124,7 +124,8 @@ int bd_clpi_Parse( bd_clpi_t *p_clpi, bs_t *s, int i_id )
     /* */
     if( bs_read( s, 32 ) != 0x48444D56 )
         return VLC_EGENERIC;
-    if( bs_read( s, 32 ) != 0x30323030 )
+    const uint32_t i_version = bs_read( s, 32 );
+    if( i_version != 0x30313030 && i_version != 0x30323030 )
         return VLC_EGENERIC;
 
     /* */
diff --git a/modules/access/bd/mpls.c b/modules/access/bd/mpls.c
index 1b372ae..4f597dd 100644
--- a/modules/access/bd/mpls.c
+++ b/modules/access/bd/mpls.c
@@ -289,7 +289,8 @@ int bd_mpls_Parse( bd_mpls_t *p_mpls, bs_t *s, int i_id )
     /* */
     if( bs_read( s, 32 ) != 0x4d504c53 )
         return VLC_EGENERIC;
-    if( bs_read( s, 32 ) != 0x30323030 )
+    const uint32_t i_version = bs_read( s, 32 );
+    if( i_version != 0x30313030 && i_version != 0x30323030 )
         return VLC_EGENERIC;
 
     const uint32_t i_play_item_start = bs_read( s, 32 );




More information about the vlc-devel mailing list