[vlc-commits] commit: Revert "dvdread: minimum value for ps_pkt_size is 6" ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 10 12:56:19 2010 +0300| [d22239dab06428b0b13be6631ec9782d3dd344d3] | committer: Rémi Denis-Courmont 

Revert "dvdread: minimum value for ps_pkt_size is 6"

This reverts commit 76003f0e6cd54217619b68537ba73c089c60c8ed,
which is not needed anymore.

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

 modules/access/dvdread.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index f5a37ec..a962157 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -559,15 +559,10 @@ static int DemuxBlock( demux_t *p_demux, uint8_t *pkt, int i_pkt )
     demux_sys_t *p_sys = p_demux->p_sys;
     uint8_t     *p = pkt;
 
-    while( p && p < &pkt[i_pkt] )
+    while( p < &pkt[i_pkt] )
     {
+        int i_size = ps_pkt_size( p, &pkt[i_pkt] - p );
         block_t *p_pkt;
-        int i_size = &pkt[i_pkt] - p;
-
-        if( i_size < 6 )
-            break;
- 
-        i_size = ps_pkt_size( p, i_size );
         if( i_size <= 0 )
         {
             break;